Merge branch 'develop'

.github/workflows/develop.yml

@@ -77,8 +77,9 @@ jobs:
           git config user.name "Chuck"
           git config user.email "Chuck@users.noreply.github.com"
           git remote set-url origin "$GITLAB_URL"
-          git commit -am "Generated Image New Tag"
-          git push origin develop
+          git commit -am "Update Image Tag"
+          git tag -a $TAG -m "日常迭代"
+          git push origin develop --tags
 
       - name: Send Error Notification by WeChat
         if: ${{ failure() }}

.github/workflows/master.yml

@@ -77,8 +77,9 @@ jobs:
           git config user.name "Chuck"
           git config user.email "Chuck@users.noreply.github.com"
           git remote set-url origin "$GITLAB_URL"
-          git commit -am "Generated Image New Tag"
-          git push origin master
+          git commit -am "Update Image Tag"
+          git tag -a $TAG -m "日常迭代"
+          git push origin master --tags
 
       - name: Send Error Notification by WeChat
         if: ${{ failure() }}

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/TenderNewsDTO.java

@@ -29,4 +29,6 @@ public class TenderNewsDTO implements Serializable {
     private Integer port;
     @ApiModelProperty(value = "发布日期")
     private Date createTime;
+    @ApiModelProperty(value = "地址")
+    private String url;
 }

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

@@ -31,4 +31,7 @@ public class TenderNewsVO implements Serializable {
     private Integer using;
     @ApiModelProperty(value = "所属产品")
     private Integer port;
+    @ApiModelProperty(value = "地址")
+    private String url;
+
 }

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 30f8abbb75fdaee2977544ed888bc1e7997ca550
+  newTag: afd137bc09338fd83c1f801db939452625f234d5

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

@@ -4,12 +4,12 @@ import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.release.feign.PmsAppApi;
 import com.mmc.csf.release.flyer.qo.CurriculumQo;
 import com.mmc.csf.release.flyer.vo.CurriculumInfoVO;
-import com.mmc.csf.release.model.group.Insert;
-import com.mmc.csf.release.model.group.Update;
-import com.mmc.csf.release.service.FlyerTrainingService;
 import com.mmc.csf.release.flyer.vo.DronePilotLicenseVO;
 import com.mmc.csf.release.flyer.vo.FlightSkillsVO;
 import com.mmc.csf.release.flyer.vo.RegistrationVO;
+import com.mmc.csf.release.model.group.Insert;
+import com.mmc.csf.release.model.group.Update;
+import com.mmc.csf.release.service.FlyerTrainingService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -83,6 +83,13 @@ public class FlyerTrainingController extends BaseController{
         return flyerTrainingService.feignCurriculumInfoList(categoriesId);
     }
 
+    @ApiOperation(value = "feign-V1.0.1课程视频列表数量", hidden = true)
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = Integer.class)})
+    @GetMapping("/feignCountCurriculumInfo")
+    public int feignCountCurriculumInfo(@RequestParam Integer categoriesId) {
+        return flyerTrainingService.feignCountCurriculumInfo(categoriesId);
+    }
+
     @ApiOperation(value = "V1.0.1课程视频详情")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CurriculumInfoVO.class)})
     @GetMapping("/curriculumDetails")

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

@@ -84,4 +84,7 @@ public interface FlyerTrainingDao {
      * @return
      */
     List<FlightSkillsDO> treeCurriculumSkill();
+
+    int countCurriculumInfo(Integer categoriesId);
+
 }

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

@@ -29,9 +29,10 @@ public class TenderNewsDO implements Serializable {
     private Integer deleted;
     private Date createTime;
     private Date updateTime;
+    private String  url;
 
     public TenderNewsDTO buildTenderNewsDTO(){
-        return TenderNewsDTO.builder().id(this.id).tenderName(this.tenderName).using(this.using).port(this.port).createTime(this.createTime)
+        return TenderNewsDTO.builder().id(this.id).tenderName(this.tenderName).using(this.using).port(this.port).createTime(this.createTime).url(this.url)
                 .build();
     }
 
@@ -40,5 +41,6 @@ public class TenderNewsDO implements Serializable {
         this.tenderName = tenderNewsVO.getTenderName();
         this.using = tenderNewsVO.getUsing();
         this.port = tenderNewsVO.getPort();
+        this.url=tenderNewsVO.getUrl();
     }
 }

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

@@ -5,7 +5,6 @@ import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.release.flyer.qo.CurriculumQo;
 import com.mmc.csf.release.flyer.vo.CurriculumInfoVO;
 import com.mmc.csf.release.flyer.vo.RegistrationVO;
-import io.swagger.models.auth.In;
 
 import java.util.List;
 
@@ -85,4 +84,6 @@ public interface FlyerTrainingService {
      * @return
      */
     List<CurriculumInfoVO> feignCurriculumInfoList(Integer categoriesId);
+
+    int feignCountCurriculumInfo(Integer categoriesId);
 }

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

@@ -197,4 +197,10 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
         List<CurriculumInfoVO> list = curriculumList.stream().map(CurriculumInfoDO::buildCurriculumInfoVO).collect(Collectors.toList());
         return list;
     }
+
+    @Override
+    public int feignCountCurriculumInfo(Integer categoriesId) {
+        int count = flyerTrainingDao.countCurriculumInfo(categoriesId);
+        return count;
+    }
 }

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

@@ -163,4 +163,4 @@ iuav:
 #  endpoints:
 #    web:
 #      exposure:
-#        include: "*"
\ No newline at end of file
+#        include: "*"

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

@@ -51,6 +51,9 @@
         <if test="date != null ">
             and Date(create_time) = #{date}
         </if>
+        <if test="keyword != null ">
+            and case_title like CONCAT("%",#{keyword},"%")
+        </if>
     </select>
 
     <select id="listCasePage" resultType="com.mmc.csf.release.entity.information.IndustryCaseDO" parameterType="com.mmc.csf.infomation.qo.IndustryCaseQO">
@@ -74,6 +77,9 @@
         <if test="date != null ">
             and Date(create_time) = #{date}
         </if>
+        <if test="keyword != null ">
+            and case_title like CONCAT("%",#{keyword},"%")
+        </if>
         order by create_time desc
         limit #{pageNo}, #{pageSize}
     </select>

release-service/src/main/resources/mapper/flyer/FlyerTrainingDao.xml

@@ -189,4 +189,11 @@
             flight_skills fs0
             INNER JOIN flight_skills fs1 ON fs0.id = fs1.pid
     </select>
+    <select id="countCurriculumInfo" resultType="java.lang.Integer">
+        SELECT
+            count(*)
+        from curriculum_info
+        where categories_id = #{categoriesId}
+        and is_deleted = 0
+    </select>
 </mapper>

release-service/src/main/resources/mapper/news/IndustryNewsDao.xml

@@ -16,6 +16,9 @@
         <if test="date != null ">
             and Date(create_time) = #{date}
         </if>
+        <if test="keyword != null ">
+            and news_title like CONCAT("%",#{keyword},"%")
+        </if>
     </select>
 
     <select id="listNewsPage" resultType="com.mmc.csf.release.entity.information.IndustryNewsDO"
@@ -40,6 +43,9 @@
         <if test="date != null ">
             and Date(create_time) = #{date}
         </if>
+        <if test="keyword != null ">
+            and news_title like CONCAT("%",#{keyword},"%")
+        </if>
         order by create_time desc
         limit #{pageNo}, #{pageSize}
     </select>

release-service/src/main/resources/mapper/tender/TenderDao.xml

@@ -11,6 +11,7 @@
         <result column="is_deleted" property="deleted"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
+        <result column="url" property="url"/>
     </resultMap>
 
     <resultMap id="tenderInfoResultMap" type="com.mmc.csf.release.entity.tender.TenderInfoDO">
@@ -42,8 +43,8 @@
 
     <insert id="addTenderNewsDO" useGeneratedKeys="true"
             keyProperty="id" parameterType="com.mmc.csf.release.entity.tender.TenderNewsDO">
-        insert into tender_news(tender_name, is_using, port, create_time)
-        values (#{tenderName}, #{using}, #{port}, NOW())
+        insert into tender_news(tender_name, is_using, port, create_time,url)
+        values (#{tenderName}, #{using}, #{port}, NOW(),#{url})
     </insert>
 
     <insert id="batchAddTenderInfo" useGeneratedKeys="true"
@@ -87,6 +88,9 @@
             <if test=" port != null ">
                 port = #{port}
             </if>
+            <if test=" url != null and url!='' ">
+                url = #{url}
+            </if>
         </set>
         where id = #{id}
     </update>
@@ -131,7 +135,7 @@
     </select>
 
     <select id="listTenderNews" resultMap="tenderNewsResultMap">
-        select id,tender_name,is_using,port,is_deleted,create_time from tender_news
+        select id,tender_name,is_using,port,is_deleted,create_time,url from tender_news
         where is_deleted = 0
         <if test=" tenderName != null and tenderName != '' ">
             and tender_name like CONCAT('%',#{tenderName},'%')
@@ -358,4 +362,4 @@
             is_deleted = 0 and id = #{id}
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>

release-service/src/main/resources/not-check.yml

@@ -20,6 +20,7 @@ data-filter:
     - /release/work/listAllTaskService
     - /release/curriculum/queryCurriculumInfoList
     - /release/curriculum/feignCurriculumInfoList
+    - /release/curriculum/feignCountCurriculumInfo
     - /release/website/getWebsiteByAdCode
     - /release/website/getWebsiteList
     - /release/website/flyer/bitmap
@@ -31,3 +32,4 @@ data-filter:
     - /release/module/listBannerImg
     - /release/tender/info
     - /release/actuator/health/readiness
+    - /release/tender/infoById