业务案例及需求相关功能更新

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/qo/IndustryCaseQO.java

@@ -23,9 +23,12 @@ import java.util.List;
 public class IndustryCaseQO implements Serializable {
 
     private static final long serialVersionUID = -4615177472593013257L;
-    @ApiModelProperty(value = "关键字", required = false, hidden = true)
+    @ApiModelProperty(value = "关键字", required = false)
     private String keyword;
 
+    @ApiModelProperty(value = "需求类型id", required = false)
+    private Integer requirementTypeId;
+
     @ApiModelProperty(value = "省份编码", required = false)
     private Integer provinceCode;
 

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/IndustryCaseVO.java

 package com.mmc.csf.infomation.vo;
 
+import com.mmc.csf.release.model.group.Update;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -20,13 +22,18 @@ import java.util.Date;
 public class IndustryCaseVO implements Serializable {
     private static final long serialVersionUID = 8278011392722950911L;
     @ApiModelProperty(value = "id")
+    @NotNull(message = "is不能为空", groups = {Update.class})
     private Integer id;
     @ApiModelProperty(value = "案例标题")
+    @NotNull(message = "标题不能为空")
     private String caseTitle;
     @ApiModelProperty(value = "作者")
     private String caseAuthor;
     @ApiModelProperty(value = "发布者id")
     private Integer userAccountId;
+    @ApiModelProperty(value = "来源")
+    @NotNull(message = "来源不能为空")
+    private String origin;
     @ApiModelProperty(value = "封面图")
     private String surfaceImg;
     @ApiModelProperty(value = "案例内容")

release-service/src/main/java/com/mmc/csf/release/controller/IndustryCaseController.java

@@ -3,7 +3,9 @@ package com.mmc.csf.release.controller;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.infomation.qo.IndustryCaseQO;
 import com.mmc.csf.infomation.vo.IndustryCaseVO;
+import com.mmc.csf.release.model.group.Insert;
 import com.mmc.csf.release.model.group.Page;
+import com.mmc.csf.release.model.group.Update;
 import com.mmc.csf.release.service.IndustryCaseService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -22,7 +24,7 @@ import javax.servlet.http.HttpServletRequest;
 @Api(tags = {"业务案例相关"})
 @RestController
 @RequestMapping("/industry-case/")
-public class IndustryCaseController {
+public class IndustryCaseController extends BaseController{
     @Autowired
     private IndustryCaseService industryCaseService;
 
@@ -39,4 +41,25 @@ public class IndustryCaseController {
     public ResultBody details(@RequestParam Integer id){
         return industryCaseService.details(id);
     }
+
+    @ApiOperation(value = "添加业务案例")
+    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = IndustryCaseVO.class) })
+    @PostMapping("addCase")
+    public ResultBody addCase(@Validated(value = {Insert.class})@RequestBody IndustryCaseVO industryCaseVO, HttpServletRequest request){
+        return industryCaseService.addCase(industryCaseVO, this.getUserLoginInfoFromRedis(request));
+    }
+
+    @ApiOperation(value = "修改业务案例")
+    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = IndustryCaseVO.class) })
+    @PostMapping("updateCase")
+    public ResultBody updateCase(@Validated(value = {Update.class})@RequestBody IndustryCaseVO industryCaseVO, HttpServletRequest request){
+        return industryCaseService.updateCase(industryCaseVO, this.getUserLoginInfoFromRedis(request));
+    }
+
+    @ApiOperation(value = "删除业务案例")
+    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = IndustryCaseVO.class) })
+    @GetMapping("deleteDetails")
+    public ResultBody deleteDetails(@RequestParam Integer id){
+        return industryCaseService.deleteDetails(id);
+    }
 }

release-service/src/main/java/com/mmc/csf/release/controller/RequirementsController.java

@@ -59,4 +59,11 @@ public class RequirementsController extends BaseController{
         return requirementsService.solveRequire(requirementsInfoId, this.getUserLoginInfoFromRedis(request).getUserAccountId());
     }
 
+    @ApiOperation(value = "删除需求")
+    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
+    @GetMapping("deleteRequire")
+    public ResultBody deleteRequire(@RequestParam Integer requirementsInfoId, HttpServletRequest request){
+        return requirementsService.deleteRequire(requirementsInfoId, this.getUserLoginInfoFromRedis(request).getUserAccountId());
+    }
+
 }

release-service/src/main/java/com/mmc/csf/release/dao/IndustryCaseDao.java

@@ -32,4 +32,22 @@ public interface IndustryCaseDao {
      * @return
      */
     IndustryCaseDO details(Integer id);
+
+    /**
+     * 添加业务案例
+     * @param industryCaseDO
+     */
+    void insertIndustryCase(IndustryCaseDO industryCaseDO);
+
+    /**
+     * 更新业务案例
+     * @param industryCaseDO
+     */
+    void updateCase(IndustryCaseDO industryCaseDO);
+
+    /**
+     * 删除业务案例
+     * @param id
+     */
+    void removeDetail(Integer id);
 }

release-service/src/main/java/com/mmc/csf/release/dao/RequirementsDao.java

@@ -50,4 +50,10 @@ public interface RequirementsDao {
      * @return
      */
     List<RequirementsInfoDO> listPublishPage(IndustryCaseQO industryCaseQO);
+
+    /**
+     * 删除需求
+     * @param requirementsInfoId
+     */
+    void removeRequire(Integer requirementsInfoId);
 }

release-service/src/main/java/com/mmc/csf/release/entity/IndustryCaseDO.java

 package com.mmc.csf.release.entity;
 
 import com.mmc.csf.infomation.vo.IndustryCaseVO;
-import com.mmc.csf.infomation.vo.IndustryNewsVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -25,11 +24,12 @@ public class IndustryCaseDO implements Serializable {
     private String surfaceImg;
     private String caseContents;
     private Integer deleted;
+    private String origin;
     private Date createTime;
     private Date updateTime;
 
     public IndustryCaseVO buildIndustryCaseVO(){
-        return IndustryCaseVO.builder().id(id).caseTitle(caseTitle).caseAuthor(caseAuthor).userAccountId(userAccountId).surfaceImg(surfaceImg).
+        return IndustryCaseVO.builder().id(id).caseTitle(caseTitle).caseAuthor(caseAuthor).origin(this.origin).userAccountId(userAccountId).surfaceImg(surfaceImg).
                 caseContents(caseContents).createTime(createTime).updateTime(updateTime).build();
     }
 
@@ -40,6 +40,7 @@ public class IndustryCaseDO implements Serializable {
         this.userAccountId = industryCaseVO.getUserAccountId();
         this.surfaceImg = industryCaseVO.getSurfaceImg();
         this.caseContents = industryCaseVO.getCaseContents();
+        this.origin = industryCaseVO.getOrigin();
     }
 
 }

release-service/src/main/java/com/mmc/csf/release/service/IndustryCaseService.java

@@ -2,6 +2,8 @@ package com.mmc.csf.release.service;
 
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.infomation.qo.IndustryCaseQO;
+import com.mmc.csf.infomation.vo.IndustryCaseVO;
+import com.mmc.csf.release.auth.dto.LoginSuccessDTO;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -24,4 +26,27 @@ public interface IndustryCaseService {
      * @return
      */
     ResultBody details(Integer id);
+
+    /**
+     * 添加业务案例
+     * @param industryCaseVO
+     * @param userLoginInfo
+     * @return
+     */
+    ResultBody addCase(IndustryCaseVO industryCaseVO, LoginSuccessDTO userLoginInfo);
+
+    /**
+     * 修改业务案例
+     * @param industryCaseVO
+     * @param userLoginInfo
+     * @return
+     */
+    ResultBody updateCase(IndustryCaseVO industryCaseVO, LoginSuccessDTO userLoginInfo);
+
+    /**
+     * 删除业务案例
+     * @param id
+     * @return
+     */
+    ResultBody deleteDetails(Integer id);
 }

release-service/src/main/java/com/mmc/csf/release/service/RequirementsService.java

@@ -40,4 +40,12 @@ public interface RequirementsService {
      * @return
      */
     ResultBody listPublishPage(IndustryCaseQO industryCaseQO, HttpServletRequest request);
+
+    /**
+     * 删除需求
+     * @param requirementsInfoId
+     * @param userAccountId
+     * @return
+     */
+    ResultBody deleteRequire(Integer requirementsInfoId, Integer userAccountId);
 }

release-service/src/main/java/com/mmc/csf/release/service/impl/IndustryCaseServiceImpl.java

@@ -4,6 +4,7 @@ import com.mmc.csf.common.util.page.PageResult;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.infomation.qo.IndustryCaseQO;
 import com.mmc.csf.infomation.vo.IndustryCaseVO;
+import com.mmc.csf.release.auth.dto.LoginSuccessDTO;
 import com.mmc.csf.release.constant.TokenConstant;
 import com.mmc.csf.release.dao.IndustryCaseDao;
 import com.mmc.csf.release.entity.IndustryCaseDO;
@@ -55,4 +56,25 @@ public class IndustryCaseServiceImpl implements IndustryCaseService {
         return ResultBody.success();
     }
 
+    @Override
+    public ResultBody addCase(IndustryCaseVO industryCaseVO, LoginSuccessDTO userLoginInfo) {
+        IndustryCaseDO industryCaseDO = new IndustryCaseDO(industryCaseVO);
+        industryCaseDO.setUserAccountId(userLoginInfo.getUserAccountId());
+        industryCaseDao.insertIndustryCase(industryCaseDO);
+        return ResultBody.success();
+    }
+
+    @Override
+    public ResultBody updateCase(IndustryCaseVO industryCaseVO, LoginSuccessDTO userLoginInfo) {
+        IndustryCaseDO industryCaseDO = new IndustryCaseDO(industryCaseVO);
+        industryCaseDao.updateCase(industryCaseDO);
+        return ResultBody.success();
+    }
+
+    @Override
+    public ResultBody deleteDetails(Integer id) {
+        industryCaseDao.removeDetail(id);
+        return ResultBody.success();
+    }
+
 }
\ No newline at end of file

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -87,4 +87,10 @@ public class RequirementsServiceImpl implements RequirementsService {
         }
         return ResultBody.success(PageResult.buildPage(pageNo, industryCaseQO.getPageSize(), count, requirementsInfoVOS));
     }
+
+    @Override
+    public ResultBody deleteRequire(Integer requirementsInfoId, Integer userAccountId) {
+        requirementsDao.removeRequire(requirementsInfoId);
+        return ResultBody.success();
+    }
 }

release-service/src/main/resources/application-local.yml

@@ -117,7 +117,7 @@ mybatis:
 
 iuav:
   userapp:
-    url: http://cms-svc:35150
+    url: http://127.0.0.1:35150
   pmsapp:
     url: http://127.0.0.1:8099
 

release-service/src/main/resources/mapper/case/IndustryCaseDao.xml

@@ -3,6 +3,41 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.mmc.csf.release.dao.IndustryCaseDao">
+    <insert id="insertIndustryCase" parameterType="com.mmc.csf.release.entity.IndustryCaseDO" useGeneratedKeys="true" keyProperty="id">
+        insert into industry_case(case_title, case_author, user_account_id, surface_img, case_contents, origin, create_time)
+        values(#{caseTitle}, #{caseAuthor}, #{userAccountId}, #{surfaceImg}, #{caseContents}, #{origin}, NOW())
+    </insert>
+
+    <update id="updateCase" parameterType="com.mmc.csf.release.entity.IndustryCaseDO">
+        update industry_case
+        <set>
+            <if test="caseTitle != null">
+                case_title = #{caseTitle},
+            </if>
+            <if test="caseAuthor != null">
+                case_author = #{caseAuthor},
+            </if>
+            <if test="userAccountId != null">
+                user_account_id = #{userAccountId},
+            </if>
+            <if test="surfaceImg != null">
+                surface_img = #{surfaceImg},
+            </if>
+            <if test="caseContents != null">
+                case_contents = #{caseContents},
+            </if>
+            <if test="origin != null">
+                origin = #{origin}
+            </if>
+        </set>
+        <where>
+            id = #{id}
+        </where>
+    </update>
+
+    <update id="removeDetail">
+        update industry_case set is_deleted = 1 where id = #{id}
+    </update>
 
     <select id="countListCasePage" resultType="java.lang.Integer" parameterType="com.mmc.csf.infomation.qo.IndustryCaseQO">
         select count(*) from industry_case
@@ -26,7 +61,8 @@
         surface_img,
         case_contents,
         create_time,
-        update_time
+        update_time,
+        origin
         from industry_case
         where is_deleted = 0
         <if test=" userIds != null ">
@@ -50,7 +86,8 @@
         surface_img,
         case_contents,
         create_time,
-        update_time
+        update_time,
+        origin
         from industry_case
         where is_deleted = 0 and id = #{id}
     </select>

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -14,6 +14,10 @@
         update requirements_info set is_solved = 1 where id = #{requirementsInfoId}
     </update>
     
+    <update id="removeRequire">
+        update requirements_info set is_deleted = 1 where id = #{requirementsInfoId}
+    </update>
+
     <select id="listType" resultType="com.mmc.csf.release.entity.RequirementsTypeDO">
         select id, type_name from requirements_type where is_deleted = 0
     </select>
@@ -25,6 +29,12 @@
     <select id="countListPublishPage" resultType="java.lang.Integer" parameterType="com.mmc.csf.infomation.qo.IndustryCaseQO">
         select count(*) from requirements_info
         where is_deleted = 0
+        <if test="keyword != null">
+            and (
+            publish_name like CONCAT("%",#{keyword},"%") or
+            publish_phone like CONCAT("%",#{keyword},"%")
+            )
+        </if>
         <if test="date != null ">
             and Date(create_time) = #{date}
         </if>
@@ -37,6 +47,9 @@
         <if test="districtCode != null ">
             and district_code = #{districtCode}
         </if>
+        <if test="requirementTypeId != null ">
+            and requirement_type_id = #{requirementTypeId}
+        </if>
     </select>
 
     <select id="listPublishPage" resultType="com.mmc.csf.release.entity.RequirementsInfoDO" parameterType="com.mmc.csf.infomation.qo.IndustryCaseQO">
@@ -52,6 +65,12 @@
         update_time
         from requirements_info
         where is_deleted = 0
+        <if test="keyword != null">
+            and (
+            publish_name like CONCAT("%",#{keyword},"%") or
+            publish_phone like CONCAT("%",#{keyword},"%")
+            )
+        </if>
         <if test="date != null ">
             and Date(create_time) = #{date}
         </if>
@@ -64,6 +83,9 @@
         <if test="districtCode != null ">
             and district_code = #{districtCode}
         </if>
+        <if test="requirementTypeId != null ">
+            and requirement_type_id = #{requirementTypeId}
+        </if>
         order by create_time desc
         limit #{pageNo}, #{pageSize}
     </select>