Skip to content

I
ims-ci-test
提交 10155ff6 作者: xiaowang
操作

信息发布数据看板

上级 ca2f4493
正在显示 包含 81 行增加 和 46 行删除
release-service/src/main/java/com/mmc/csf/release/controller/FlyerTrainingController.java
......@@ -14,6 +14,7 @@ import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
......@@ -28,7 +29,7 @@ import java.util.List;
@Api(tags = {"web-小程序-飞手培训-模块"})
@RestController
@RequestMapping("/curriculum/")
public class FlyerTrainingController extends BaseController{
public class FlyerTrainingController extends BaseController {
@Resource
private FlyerTrainingService flyerTrainingService;
......@@ -37,7 +38,7 @@ public class FlyerTrainingController extends BaseController{
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@PostMapping("/pilotRegistration")
public ResultBody pilotRegistration(@RequestBody RegistrationVO registrationVO, HttpServletRequest request) {
return flyerTrainingService.pilotRegistration(registrationVO,this.getUserLoginInfoFromRedis(request).getUserAccountId());
return flyerTrainingService.pilotRegistration(registrationVO, this.getUserLoginInfoFromRedis(request).getUserAccountId());
}
......@@ -100,7 +101,7 @@ public class FlyerTrainingController extends BaseController{
@ApiOperation(value = "V1.0.1新增课程")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = CurriculumInfoVO.class)})
@PostMapping("addCurriculum")
public ResultBody addCurriculum(@Validated(Insert.class)@RequestBody CurriculumInfoVO curriculumInfoVO) {
public ResultBody addCurriculum(@Validated(Insert.class) @RequestBody CurriculumInfoVO curriculumInfoVO) {
return ResultBody.success(flyerTrainingService.addCurriculum(curriculumInfoVO));
}
......@@ -127,4 +128,12 @@ public class FlyerTrainingController extends BaseController{
public ResultBody test() {
return ResultBody.success(pmsAppApi.feignQqueryCategoryInfoByType(3));
}
@ApiOperation(value = "获取课程总数")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = Integer.class)})
@GetMapping("getCurriculumCount")
@ApiIgnore
public Integer getCurriculumCount() {
return flyerTrainingService.getCurriculumCount();
}
}
release-service/src/main/java/com/mmc/csf/release/dao/FlyerTrainingDao.java
......@@ -62,28 +62,33 @@ public interface FlyerTrainingDao {
/**
* 添加课程信息
*
* @param currInfoDO
*/
Integer addCurriculum(CurriculumInfoDO currInfoDO);
/**
* 修改课程信息
*
* @param currInfoDO
*/
Integer updateCurriculum(CurriculumInfoDO currInfoDO);
/**
* 删除课程
*
* @param id
*/
Integer removeCurriculum(Integer id);
/**
* 课程技能列表
*
* @return
*/
List<FlightSkillsDO> treeCurriculumSkill();
int countCurriculumInfo(Integer categoriesId);
Integer getCurriculumCount();
}
release-service/src/main/java/com/mmc/csf/release/service/FlyerTrainingService.java
......@@ -20,7 +20,7 @@ public interface FlyerTrainingService {
* @param registrationVO 注册信息
* @return {@link ResultBody}
*/
ResultBody pilotRegistration(RegistrationVO registrationVO,Integer userAccount);
ResultBody pilotRegistration(RegistrationVO registrationVO, Integer userAccount);
/**
* 获取无人机飞行员执照
......@@ -56,34 +56,41 @@ public interface FlyerTrainingService {
/**
* 添加课程
*
* @param curriculumInfoVO
*/
Integer addCurriculum(CurriculumInfoVO curriculumInfoVO);
/**
* 修改课程
*
* @param curriculumInfoVO
*/
Integer updateCurriculum(CurriculumInfoVO curriculumInfoVO);
/**
* 删除课程
*
* @param id
*/
Integer removeCurriculum(Integer id);
/**
* 课程列表
*
* @return
*/
ResultBody treeCurriculumSkill();
/**
* 根据分类列表查询课程
*
* @param categoriesId
* @return
*/
List<CurriculumInfoVO> feignCurriculumInfoList(Integer categoriesId);
int feignCountCurriculumInfo(Integer categoriesId);
Integer getCurriculumCount();
}
release-service/src/main/java/com/mmc/csf/release/service/impl/FlyerTrainingServiceImpl.java
......@@ -41,7 +41,7 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
private PmsAppApi pmsAppApi;
@Override
public ResultBody pilotRegistration(RegistrationVO registrationVO,Integer userAccountId) {
public ResultBody pilotRegistration(RegistrationVO registrationVO, Integer userAccountId) {
PilotRegistrationDO pilotRegistrationDO = new PilotRegistrationDO(registrationVO);
pilotRegistrationDO.setApplyUserId(userAccountId);
if (CollectionUtils.isNotEmpty(registrationVO.getIndustryAppAuth())) {
......@@ -99,12 +99,12 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
List<CurriculumInfoDO> curriculumList = flyerTrainingDao.listPageCurriculumInfo(curriculumQo);
List<AllCategoryDTO> allCategoryDTOS = pmsAppApi.feignQqueryCategoryInfoByType(3);
List<CurriculumInfoVO> list = curriculumList.stream().map(CurriculumInfoDO::buildCurriculumInfoVO).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(allCategoryDTOS)){
if (CollectionUtils.isNotEmpty(allCategoryDTOS)) {
list.stream().forEach(curriculumInfoVO -> {
allCategoryDTOS.stream().forEach(directory -> {
if (CollectionUtils.isNotEmpty(directory.getCategoriesInfoListDTO())){
if (CollectionUtils.isNotEmpty(directory.getCategoriesInfoListDTO())) {
directory.getCategoriesInfoListDTO().stream().forEach(category -> {
if (curriculumInfoVO.getCategoriesId().equals(category.getId())){
if (curriculumInfoVO.getCategoriesId().equals(category.getId())) {
curriculumInfoVO.setDirectoryName(directory.getName());
curriculumInfoVO.setCategoriesName(category.getName());
}
......@@ -132,25 +132,25 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
@Override
public ResultBody curriculumDetails(Integer id) {
CurriculumInfoDO curriculumInfoDO = flyerTrainingDao.curriculumDetails(id);
if (curriculumInfoDO == null) {
return ResultBody.error("课程不存在或已下架！");
}else {
CurriculumInfoVO curriculumInfoVO = curriculumInfoDO.buildCurriculumInfoVO();
List<AllCategoryDTO> allCategoryDTOS = pmsAppApi.feignQqueryCategoryInfoByType(3);
for (AllCategoryDTO directory : allCategoryDTOS) {
if (CollectionUtils.isNotEmpty(directory.getCategoriesInfoListDTO())){
for (CategoriesInfoListDTO category : directory.getCategoriesInfoListDTO()) {
if (curriculumInfoVO.getCategoriesId().equals(category.getId())){
curriculumInfoVO.setDirectoryName(directory.getName());
curriculumInfoVO.setCategoriesName(category.getName());
break;
}
}
}
}
return ResultBody.success(curriculumInfoVO);
}
CurriculumInfoDO curriculumInfoDO = flyerTrainingDao.curriculumDetails(id);
if (curriculumInfoDO == null) {
return ResultBody.error("课程不存在或已下架！");
} else {
CurriculumInfoVO curriculumInfoVO = curriculumInfoDO.buildCurriculumInfoVO();
List<AllCategoryDTO> allCategoryDTOS = pmsAppApi.feignQqueryCategoryInfoByType(3);
for (AllCategoryDTO directory : allCategoryDTOS) {
if (CollectionUtils.isNotEmpty(directory.getCategoriesInfoListDTO())) {
for (CategoriesInfoListDTO category : directory.getCategoriesInfoListDTO()) {
if (curriculumInfoVO.getCategoriesId().equals(category.getId())) {
curriculumInfoVO.setDirectoryName(directory.getName());
curriculumInfoVO.setCategoriesName(category.getName());
break;
}
}
}
}
return ResultBody.success(curriculumInfoVO);
}
}
@Override
......@@ -201,4 +201,9 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
int count = flyerTrainingDao.countCurriculumInfo(categoriesId);
return count;
}
@Override
public Integer getCurriculumCount() {
return flyerTrainingDao.getCurriculumCount();
}
}
release-service/src/main/resources/mapper/flyer/FlyerTrainingDao.xml
......@@ -8,7 +8,8 @@
<id column="id" property="id"/>
<result column="pid" property="pid"/>
<result column="skills_name" property="skillsName"/>
<collection property="childrenSkills" ofType="com.mmc.csf.release.entity.curriculum.FlightSkillsDO" javaType="java.util.List">
<collection property="childrenSkills" ofType="com.mmc.csf.release.entity.curriculum.FlightSkillsDO"
javaType="java.util.List">
<id column="childId" property="id"/>
<result column="childIdPid" property="pid"/>
<result column="childIdSkillsName" property="skillsName"/>
......@@ -24,9 +25,12 @@
#{uavLicenseLevelTwo}, #{uavLicenseLevelThree}, #{industryAppAuth}, #{remark})
</insert>
<insert id="addCurriculum" keyProperty="id" useGeneratedKeys="true" parameterType="com.mmc.csf.release.entity.curriculum.CurriculumInfoDO">
INSERT INTO `curriculum_info`(`curriculum_name`, `supplier_id`, `curriculum_desc`, `drone_pilot_license_id`, `flight_skills`, `categories_id`, `surface_url`, `video_url`, `detail_content`)
VALUES (#{curriculumName},#{supplierId},#{curriculumDesc},#{dronePilotLicenseId},#{flightSkills},#{categoriesId},#{surfaceUrl},#{videoUrl},#{detailContent});
<insert id="addCurriculum" keyProperty="id" useGeneratedKeys="true"
parameterType="com.mmc.csf.release.entity.curriculum.CurriculumInfoDO">
INSERT INTO `curriculum_info`(`curriculum_name`, `supplier_id`, `curriculum_desc`, `drone_pilot_license_id`,
`flight_skills`, `categories_id`, `surface_url`, `video_url`, `detail_content`)
VALUES (#{curriculumName}, #{supplierId}, #{curriculumDesc}, #{dronePilotLicenseId}, #{flightSkills},
#{categoriesId}, #{surfaceUrl}, #{videoUrl}, #{detailContent});
</insert>
<update id="updateCurriculum" parameterType="com.mmc.csf.release.entity.curriculum.CurriculumInfoDO">
......@@ -63,7 +67,9 @@
</update>
<update id="removeCurriculum">
update curriculum_info set is_deleted = 1 where id = #{id}
update curriculum_info
set is_deleted = 1
where id = #{id}
</update>
<select id="selectAllLicenses" resultType="com.mmc.csf.release.flyer.vo.DronePilotLicenseVO">
select id,
......@@ -165,7 +171,7 @@
ci.supplier_id,
ci.curriculum_price,
ci.curriculum_desc,
ci.is_free free,
ci.is_free free,
ci.drone_pilot_license_id,
ci.flight_skills,
ci.detail_content,
......@@ -178,22 +184,24 @@
</select>
<select id="treeCurriculumSkill" resultMap="flightSkillsResultMap">
SELECT
fs0.id,
fs0.pid,
fs0.skills_name,
fs1.id as childId,
fs1.pid as childIdPid,
fs1.skills_name as childIdSkillsName
FROM
flight_skills fs0
INNER JOIN flight_skills fs1 ON fs0.id = fs1.pid
SELECT fs0.id,
fs0.pid,
fs0.skills_name,
fs1.id as childId,
fs1.pid as childIdPid,
fs1.skills_name as childIdSkillsName
FROM flight_skills fs0
INNER JOIN flight_skills fs1 ON fs0.id = fs1.pid
</select>
<select id="countCurriculumInfo" resultType="java.lang.Integer">
SELECT
count(*)
SELECT count(*)
from curriculum_info
where categories_id = #{categoriesId}
and is_deleted = 0
and is_deleted = 0
</select>
<select id="getCurriculumCount" resultType="java.lang.Integer">
select count(*)
from curriculum_info
where is_deleted = 0
</select>
</mapper>
release-service/src/main/resources/not-check.yml
......@@ -39,3 +39,4 @@ data-filter:
- /release/licence/background/webListOrgPage
- /release/requirements/appPublishList
- /release/dynamic/recentNews
- /release/curriculum/getCurriculumCount
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论