Commit b40f4c8b by zhuyajie

fixbug

parent cd5b199f
...@@ -53,4 +53,11 @@ public interface PcloudKeywordBiz { ...@@ -53,4 +53,11 @@ public interface PcloudKeywordBiz {
* @param id * @param id
*/ */
void deleteByKeywordClassifyId(Long id); void deleteByKeywordClassifyId(Long id);
/**
* 该技能是否被引用
* @param skillId
* @return
*/
Boolean skillExist(Long skillId);
} }
...@@ -332,4 +332,10 @@ public class PcloudKeywordBizImpl implements PcloudKeywordBiz { ...@@ -332,4 +332,10 @@ public class PcloudKeywordBizImpl implements PcloudKeywordBiz {
} }
pcloudNotKeywordDao.deleteByClassifyId(id); pcloudNotKeywordDao.deleteByClassifyId(id);
} }
@Override
public Boolean skillExist(Long skillId) {
Boolean exist = pcloudKeywordDao.skillExist(skillId);
return exist;
}
} }
...@@ -13,4 +13,6 @@ public interface PcloudKeywordDao extends BaseDao<PcloudKeyword> { ...@@ -13,4 +13,6 @@ public interface PcloudKeywordDao extends BaseDao<PcloudKeyword> {
void deleteByClassifyId(Long keywordClassifyId); void deleteByClassifyId(Long keywordClassifyId);
PcloudKeyword getByClassifyIdAndName(Integer type, Long pcloudClassifyId, String name); PcloudKeyword getByClassifyIdAndName(Integer type, Long pcloudClassifyId, String name);
Boolean skillExist(Long skillId);
} }
...@@ -31,4 +31,11 @@ public class PcloudKeywordDaoImpl extends BaseDaoImpl<PcloudKeyword> implements ...@@ -31,4 +31,11 @@ public class PcloudKeywordDaoImpl extends BaseDaoImpl<PcloudKeyword> implements
map.put("name",name); map.put("name",name);
return getSessionTemplate().selectOne(getStatement("getByClassifyIdAndName"), map); return getSessionTemplate().selectOne(getStatement("getByClassifyIdAndName"), map);
} }
@Override
public Boolean skillExist(Long skillId) {
Map<String,Object> map= new HashMap<>();
map.put("skillId", skillId);
return getSessionTemplate().selectOne(getStatement("skillExist"), map);
}
} }
...@@ -10,6 +10,7 @@ import com.pcloud.book.group.biz.WeixinQrcodeBiz; ...@@ -10,6 +10,7 @@ import com.pcloud.book.group.biz.WeixinQrcodeBiz;
import com.pcloud.book.group.enums.AppAndProductTypeEnum; import com.pcloud.book.group.enums.AppAndProductTypeEnum;
import com.pcloud.book.group.tools.SendWeixinRequestTools; import com.pcloud.book.group.tools.SendWeixinRequestTools;
import com.pcloud.book.keywords.enums.ReplyTypeEnum; import com.pcloud.book.keywords.enums.ReplyTypeEnum;
import com.pcloud.book.pcloudkeyword.biz.PcloudKeywordBiz;
import com.pcloud.book.pcloudkeyword.enums.WelcomeReplyTypeEnum; import com.pcloud.book.pcloudkeyword.enums.WelcomeReplyTypeEnum;
import com.pcloud.book.skill.biz.PcloudSkillBiz; import com.pcloud.book.skill.biz.PcloudSkillBiz;
import com.pcloud.book.skill.check.PcloudSkillCheck; import com.pcloud.book.skill.check.PcloudSkillCheck;
...@@ -67,6 +68,8 @@ public class PcloudSkillBizImpl implements PcloudSkillBiz { ...@@ -67,6 +68,8 @@ public class PcloudSkillBizImpl implements PcloudSkillBiz {
private PcloudResourceDao pcloudResourceDao; private PcloudResourceDao pcloudResourceDao;
@Autowired @Autowired
private PcloudGroupActivityDao pcloudGroupActivityDao; private PcloudGroupActivityDao pcloudGroupActivityDao;
@Autowired
private PcloudKeywordBiz pcloudKeywordBiz;
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@ParamLog("新增技能") @ParamLog("新增技能")
...@@ -236,6 +239,11 @@ public class PcloudSkillBizImpl implements PcloudSkillBiz { ...@@ -236,6 +239,11 @@ public class PcloudSkillBizImpl implements PcloudSkillBiz {
if (id==null){ if (id==null){
throw new BookBizException(BookBizException.PARAM_IS_NULL,"参数为空!"); throw new BookBizException(BookBizException.PARAM_IS_NULL,"参数为空!");
} }
//判断是否被关键词引用
Boolean hasKeyword = pcloudKeywordBiz.skillExist(id);
if (hasKeyword){
throw new BookBizException(BookBizException.PARAM_IS_NULL,"该技能已被关键词引用!");
}
pcloudSkillDao.deleteById(id); pcloudSkillDao.deleteById(id);
pcloudSubReplyDao.deleteByPcloudSkillId(id); pcloudSubReplyDao.deleteByPcloudSkillId(id);
} }
......
...@@ -105,4 +105,15 @@ ...@@ -105,4 +105,15 @@
limit 1 limit 1
</select> </select>
<select id="skillExist" resultType="Boolean" parameterType="map">
SELECT
EXISTS (
SELECT
id
FROM
pcloud_keyword
WHERE
skill_ids = #{skillId}
)
</select>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment