fanli/src/main/java/com/yeshi/fanli/controller/admin/HelpCenterAdminController.java
@@ -11,9 +11,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.commons.CommonsMultipartFile; import org.yeshi.utils.JsonUtil; import com.google.gson.Gson; @@ -47,19 +45,19 @@ @Resource private HelpCenterService helpCenterService; @Resource private HelpClassService helpClassService; @Resource private AppVersionService appVersionService; @Resource private AdActivityVersionControlService adActivityVersionControlService; /** * 保存帮助信息 * * @param callback * @param title * @param content @@ -68,8 +66,8 @@ * @param out */ @RequestMapping(value = "save") public void save(String callback,HelpCenter helpCenter, String acction ,String content, String html, PrintWriter out) { public void save(String callback, HelpCenter helpCenter, String acction, String content, String html, PrintWriter out) { try { helpCenterService.save(helpCenter, content, html); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("操作成功")); @@ -84,58 +82,56 @@ } } } @RequestMapping(value = "getInfo") public void getInfo(String callback, Long id, PrintWriter out){ try { if (id == null) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请传递正确参数")); return; } HelpCenter crrent = helpCenterService.selectByPrimaryKey(id); if (crrent == null) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作数据已不存在")); return; } HelpInfo helpInfo = helpCenterService.getHelpInfo(id); JSONObject data = new JSONObject(); data.put("id",crrent.getId()); data.put("title",crrent.getTitle()); if (crrent.getStartTime() != null) { data.put("startTime", TimeUtil.getWholeTime(crrent.getStartTime().getTime())); } else { data.put("startTime", ""); } if (crrent.getEndTime() != null) { data.put("endTime", TimeUtil.getWholeTime(crrent.getEndTime().getTime())); } else { data.put("endTime", ""); } if (helpInfo != null){ data.put("html",helpInfo.getHtml()); } else { data.put("html", ""); } if (crrent.getHelpClass() != null){ data.put("cid",crrent.getHelpClass().getId()); } else { data.put("cid", 0); } JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); } catch (HelpCenterException e) { e.printStackTrace(); public void getInfo(String callback, Long id, PrintWriter out) { if (id == null) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请传递正确参数")); return; } HelpCenter crrent = helpCenterService.selectByPrimaryKey(id); if (crrent == null) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作数据已不存在")); return; } HelpInfo helpInfo = helpCenterService.getHelpInfo(id); JSONObject data = new JSONObject(); data.put("id", crrent.getId()); data.put("title", crrent.getTitle()); if (crrent.getStartTime() != null) { data.put("startTime", TimeUtil.getWholeTime(crrent.getStartTime().getTime())); } else { data.put("startTime", ""); } if (crrent.getEndTime() != null) { data.put("endTime", TimeUtil.getWholeTime(crrent.getEndTime().getTime())); } else { data.put("endTime", ""); } if (helpInfo != null) { data.put("html", helpInfo.getHtml()); } else { data.put("html", ""); } if (crrent.getHelpClass() != null) { data.put("cid", crrent.getHelpClass().getId()); } else { data.put("cid", 0); } JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); } /** * 查找所有标签 * * @param callback * @param pageIndex * @param key @@ -144,24 +140,24 @@ * @param out */ @RequestMapping(value = "query") public void query(String callback, Integer pageIndex, Integer pageSize, String key, Long cid, Integer orderMode, String version, String platform, PrintWriter out) { public void query(String callback, Integer pageIndex, Integer pageSize, String key, Long cid, Integer orderMode, String version, String platform, PrintWriter out) { try { if (orderMode == null) if (orderMode == null) orderMode = 1; if (pageIndex == null) if (pageIndex == null) pageIndex = 1; if (pageSize == null) if (pageSize == null) pageSize = Constant.PAGE_SIZE; List<HelpCenter> list = helpCenterService.query(0, Integer.MAX_VALUE, key, cid, orderMode); if (list == null || list.size() == 0) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据")); return; } } int count = list.size(); List<AppVersionInfo> versionList = null; if (!StringUtil.isNullOrEmpty(version) || !StringUtil.isNullOrEmpty(platform)) { @@ -177,11 +173,11 @@ } } } if (versionList != null) { if (versionList.size() > 0) { List<Long> sourceIdList = new ArrayList<>(); for (HelpCenter helpCenter: list) { for (HelpCenter helpCenter : list) { sourceIdList.add(helpCenter.getId()); } List<Long> versionIdList = new ArrayList<>(); @@ -201,7 +197,7 @@ count = 0; } } int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1; PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage); List<HelpCenter> listResult = null; @@ -214,22 +210,21 @@ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("没有更多了")); return; } for (HelpCenter helpCenter: listResult) { for (HelpCenter helpCenter : listResult) { HelpClass helpClass = helpCenter.getHelpClass(); if (helpClass == null ) { if (helpClass == null) { helpClass = new HelpClass(); helpClass.setId(0L); helpClass.setName("-未选择-"); helpCenter.setHelpClass(helpClass); } } } GsonBuilder gsonBuilder = new GsonBuilder(); gsonBuilder.serializeNulls(); GsonBuilder gsonBuilder = new GsonBuilder(); gsonBuilder.serializeNulls(); Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create(); JSONObject data = new JSONObject(); data.put("pe", pe); data.put("result_list", gson.toJson(listResult)); @@ -239,8 +234,7 @@ e.printStackTrace(); } } /** * 设置版本 * @@ -277,35 +271,31 @@ versionList.add(control.getVersion().getId()); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(versionList)); } /** * 修改 * * @param callback * @param idArray * @param out */ @RequestMapping(value = "setWeight") public void setWeight(String callback, Long id, Integer weight, PrintWriter out) { try { if (id == null || weight == null) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请传递正确参数")); return; } HelpCenter crrent = new HelpCenter(); crrent.setId(id); crrent.setWeight(weight); helpCenterService.updateByPrimaryKeySelective(crrent); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("操作成功")); } catch (HelpCenterException e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作失败")); e.printStackTrace(); if (id == null || weight == null) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请传递正确参数")); return; } HelpCenter crrent = new HelpCenter(); crrent.setId(id); crrent.setWeight(weight); helpCenterService.updateByPrimaryKeySelective(crrent); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("操作成功")); } /** * 批量删除 * * @param callback * @param idArray * @param out @@ -318,53 +308,21 @@ return; } Gson gson = new Gson(); List<String> idList = gson.fromJson(idArray, new TypeToken<ArrayList<String>>() {}.getType()); List<String> idList = gson.fromJson(idArray, new TypeToken<ArrayList<String>>() { }.getType()); if (idList == null || idList.size() == 0) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请选择操作的数据")); return; } } // 删除帮助标题信息 helpCenterService.deleteBatchById(idList); // 删除帮助具体详情 helpCenterService.deleteInfoBatchById(idList); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("删除成功")); } catch (HelpCenterException e) { } catch (Exception e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("删除失败")); e.printStackTrace(); } } /** * 设置分类 * @param callback * @param out */ @RequestMapping(value = "setClass") public void saveModify(String callback, Long id, Long cid, PrintWriter out) { try { if (id == null || cid == null) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请传递正确参数")); return; } HelpCenter crrent = helpCenterService.selectByPrimaryKey(id); if (crrent == null) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作数据已不存在")); return; } if (cid == 0) { crrent.setHelpClass(null); } else { crrent.setHelpClass(new HelpClass(cid)); } crrent.setUpdatetime(new Date()); helpCenterService.updateByPrimaryKey(crrent); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("操作成功")); } catch (HelpCenterException e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作失败")); e.printStackTrace(); } } @@ -378,15 +336,15 @@ * @param out */ @RequestMapping(value = "saveClass") public void saveClass(String callback, HelpClass helpClass, HttpServletRequest request,PrintWriter out) { public void saveClass(String callback, HelpClass helpClass, HttpServletRequest request, PrintWriter out) { try { // 1. 先判断httpRequest 是否含有文件类型 // 1. 先判断httpRequest 是否含有文件类型 if (request instanceof MultipartHttpServletRequest) { MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request; helpClassService.save(helpClass, fileRequest.getFile("file")); }else{ helpClassService.save(helpClass, null); } MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request; helpClassService.save(helpClass, fileRequest.getFile("file")); } else { helpClassService.save(helpClass, null); } JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("保存成功")); } catch (FloatADException e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg())); @@ -395,32 +353,11 @@ e.printStackTrace(); } } /** * 修改系统状态 * @param callback * @param id * @param out */ @RequestMapping(value = "updateShowState") public void updateShowState(String callback, Long id, PrintWriter out) { try { int state = helpClassService.updateShowState(id); JSONObject data = new JSONObject(); data.put("showState", state); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); } catch (HelpClassException e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg())); } catch (Exception e1) { e1.printStackTrace(); JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作失败")); } } /** * 修改排序 * * @param callback * @param out */ @@ -436,30 +373,11 @@ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作失败")); } } /** * 上传图片 * @param callback * @param out */ @RequestMapping(value = "uploadClassPic") public void uploadClassPic(String callback, @RequestParam("file") CommonsMultipartFile file, Long id,PrintWriter out) { try { helpClassService.uploadPic(file, id); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("操作成功")); } catch (HelpClassException e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg())); } catch (Exception e1) { e1.printStackTrace(); JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作失败")); } } /** * 删除 * * @param callback * @param idArray * @param out @@ -472,31 +390,32 @@ } try { Gson gson = new Gson(); List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType()); List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() { }.getType()); if (list == null || list.size() == 0) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("未检测到删除的数据")); return; } int count = helpClassService.deleteByPrimaryKeyBatch(list); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("成功删除["+ count +"]条数据")); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("成功删除[" + count + "]条数据")); } catch (Exception e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("删除失败")); e.printStackTrace(); } } /** * 查询 * * @param callback * @param pageIndex * @param pageSize * @param key 模糊查询：说明、标识 * @param key 模糊查询：说明、标识 * @param out */ @RequestMapping(value = "queryClass") public void queryClass(String callback, Integer pageIndex, Integer pageSize, String key, Integer showState, String version, String platform, PrintWriter out) { public void queryClass(String callback, Integer pageIndex, Integer pageSize, String key, Integer showState, String version, String platform, PrintWriter out) { if (pageIndex == null || pageIndex < 1) { pageIndex = 1; @@ -509,7 +428,7 @@ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据")); return; } List<AppVersionInfo> versionList = null; if (!StringUtil.isNullOrEmpty(version) || !StringUtil.isNullOrEmpty(platform)) { versionList = new ArrayList<>(); @@ -525,14 +444,14 @@ } } for (HelpClass helpClass: list) { for (HelpClass helpClass : list) { Date startTime = helpClass.getStartTime(); if (startTime == null) { helpClass.setStartTime_str(""); } else { helpClass.setStartTime_str(TimeUtil.formatDateAddT(startTime)); } Date endTime = helpClass.getEndTime(); if (endTime == null) { helpClass.setEndTime_str(""); @@ -540,8 +459,7 @@ helpClass.setEndTime_str(TimeUtil.formatDateAddT(endTime)); } } // 过滤 long count = 0; if (versionList != null) { @@ -567,19 +485,19 @@ count = 0; } } int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1); PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage); GsonBuilder gsonBuilder = new GsonBuilder(); gsonBuilder.serializeNulls(); gsonBuilder.serializeNulls(); Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create(); JSONObject data = new JSONObject(); data.put("pe", pe); data.put("result_list", gson.toJson(list)); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); } catch (Exception e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常")); e.printStackTrace(); @@ -588,25 +506,25 @@ /** * 查询所有分类 * * @param out */ @RequestMapping(value = "getProvidedClass") public void getAllClass(String callback, PrintWriter out) { try { HelpClass helpClass = new HelpClass(); helpClass.setId(0L); helpClass.setName("-未选择-"); List<HelpClass> reslut_list = new ArrayList<HelpClass>(); reslut_list.add(helpClass); List<HelpClass> list = helpClassService.getProvidedClass(); if (list != null && list.size() > 0) { reslut_list.addAll(list); } JSONObject data = new JSONObject(); data.put("class_list", reslut_list); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); @@ -615,8 +533,7 @@ e.printStackTrace(); } } /** * 设置版本 * fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java
@@ -1,7 +1,9 @@ package com.yeshi.fanli.controller.apph5; import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; import java.util.Set; import javax.annotation.Resource; @@ -9,14 +11,18 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.yeshi.utils.JsonUtil; import com.yeshi.fanli.entity.AppVersionInfo; import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.entity.bus.help.HelpCenter; import com.yeshi.fanli.entity.bus.help.HelpClass; import com.yeshi.fanli.entity.bus.help.HelpInfo; import com.yeshi.fanli.exception.config.HelpCenterException; import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl.AdActivityType; import com.yeshi.fanli.service.inter.config.AppVersionService; import com.yeshi.fanli.service.inter.help.HelpCenterService; import com.yeshi.fanli.service.inter.help.HelpClassService; import com.yeshi.fanli.tag.PageEntity; import com.yeshi.fanli.service.inter.homemodule.AdActivityVersionControlService; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.StringUtil; import net.sf.json.JSONObject; @@ -30,6 +36,14 @@ @Resource private HelpClassService helpClassService; @Resource private AppVersionService appVersionService; @Resource private AdActivityVersionControlService adActivityVersionControlService; /** * 查询帮助列表 * @param callback @@ -39,47 +53,64 @@ * @param out */ @RequestMapping(value = "query") public void query(String callback, Integer pageIndex, Integer pageSize, String key, Long cid, public void query(String callback,AcceptData acceptData, Long pageId, Integer pageSize, String key, Long cid, PrintWriter out) { try { if (pageIndex == null) pageIndex = 1; if (pageSize == null) pageSize = Constant.PAGE_SIZE; if (cid != null && cid == 0) { if (cid != null && cid == 0) cid = null; // 查询全部 if (!StringUtil.isNullOrEmpty(key)) key = key.trim(); if (pageId == null) pageId = 0L; List<HelpCenter> list = helpCenterService.listValid(pageId, pageSize, key, cid); if (list == null) { pageId = 0L; list = new ArrayList<HelpCenter>(); } else if (list.size() == 0) { pageId = 0L; } else { pageId = list.get(list.size()-1).getId(); // 版本过滤 int version = Integer.parseInt(acceptData.getVersion()); String platform = acceptData.getPlatform().toLowerCase(); List<AppVersionInfo> versionList = appVersionService.listByPlatformAndMinVersionCode(platform,version); if (versionList == null || versionList.size() <= 0) { list.clear(); } else { List<Long> sourceIdList = new ArrayList<>(); for (HelpCenter record : list) { sourceIdList.add(record.getId()); } List<Long> versionIdList = new ArrayList<>(); for (AppVersionInfo versionInfo : versionList) versionIdList.add(versionInfo.getId()); Set<Long> sets = adActivityVersionControlService.filterSourceIdByVersion(sourceIdList, AdActivityType.helpCenter, versionIdList); for (int i = 0; i < list.size(); i++) { if (!sets.contains(list.get(i).getId())) { list.remove(i--); } } } } List<HelpCenter> helpCenterList = helpCenterService.queryIdAndTitle((pageIndex - 1) * pageSize, pageSize, key, cid); if (helpCenterList == null || helpCenterList.size() == 0) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "没有更多了")); return; } long count = helpCenterService.countQuery(key, cid); int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1); PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage); JSONObject data = new JSONObject(); data.put("pe", pe); data.put("result_list", helpCenterList); out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data))); data.put("pageId", pageId); data.put("result_list", JsonUtil.getApiCommonGson().toJson(list)); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); } catch (Exception e) { out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("暂未数据"))); JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据")); e.printStackTrace(); } } /** @@ -92,20 +123,16 @@ public void getInfo(String callback, Long id, PrintWriter out){ try { if (id == null) { out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("该内容不存在"))); JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("该内容不存在")); return; } HelpCenter crrent = helpCenterService.selectByPrimaryKeyCache(id); if (crrent == null) { out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("该内容已不存在"))); JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("该内容已不存在")); return; } String html = null; HelpInfo helpInfo = helpCenterService.getHelpInfoCache(id); if (helpInfo != null) { html = helpInfo.getHtml(); @@ -115,11 +142,9 @@ data.put("id",crrent.getId()); data.put("title",crrent.getTitle()); data.put("html", html); out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data))); } catch (HelpCenterException e) { out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("未获取到内容"))); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); } catch (Exception e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("数据失败")); e.printStackTrace(); } } @@ -131,19 +156,40 @@ * @param out */ @RequestMapping(value = "getClass") public void getClass(String callback, PrintWriter out) { public void getClass(String callback, AcceptData acceptData, PrintWriter out) { try { List<HelpClass> list = helpClassService.getClassByState(1); if (list == null || list.size() == 0) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据")); return; list = new ArrayList<>(); } // 版本过滤 int version = Integer.parseInt(acceptData.getVersion()); String platform = acceptData.getPlatform().toLowerCase(); List<AppVersionInfo> versionList = appVersionService.listByPlatformAndMinVersionCode(platform,version); if (versionList == null || versionList.size() <= 0) { list.clear(); } else { List<Long> sourceIdList = new ArrayList<>(); for (HelpClass record : list) { sourceIdList.add(record.getId()); } List<Long> versionIdList = new ArrayList<>(); for (AppVersionInfo versionInfo : versionList) versionIdList.add(versionInfo.getId()); Set<Long> sets = adActivityVersionControlService.filterSourceIdByVersion(sourceIdList, AdActivityType.helpClass, versionIdList); for (int i = 0; i < list.size(); i++) { if (!sets.contains(list.get(i).getId())) { list.remove(i--); } } } JSONObject data = new JSONObject(); data.put("class_list", list); data.put("class_list", JsonUtil.getApiCommonGson().toJson(list)); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); } catch (Exception e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常")); e.printStackTrace(); fanli/src/main/java/com/yeshi/fanli/dao/mybatis/help/HelpCenterMapper.java
@@ -4,25 +4,21 @@ import org.apache.ibatis.annotations.Param; import com.yeshi.fanli.dao.BaseMapper; import com.yeshi.fanli.entity.bus.help.HelpCenter; import com.yeshi.fanli.exception.config.HelpCenterException; public interface HelpCenterMapper { public interface HelpCenterMapper extends BaseMapper<HelpCenter> { int deleteByPrimaryKey(Long id); int insert(HelpCenter record); int insertSelective(HelpCenter record); HelpCenter selectByPrimaryKey(Long id); int updateByPrimaryKeySelective(HelpCenter record); int updateByPrimaryKey(HelpCenter record); List<HelpCenter> queryIdAndTitle(@Param("start") int start, @Param("count") int count, /** * 查询有效 * @param pageId * @param count * @param title * @param cid * @return */ List<HelpCenter> listValid(@Param("pageId") Long pageId, @Param("count") int count, @Param("key") String title, @Param("cid") Long cid);
@@ -6,6 +6,8 @@ import org.springframework.format.annotation.DateTimeFormat; import org.yeshi.utils.mybatis.Column; import com.google.gson.annotations.Expose; /** * 帮助中心标题 * @@ -21,9 +23,11 @@ */ private static final long serialVersionUID = 1L; @Expose @Column(name = "h_id") private Long id; @Expose @Column(name = "h_title") private String title;// 名称
@@ -5,6 +5,8 @@ import org.yeshi.utils.mybatis.Column; import org.yeshi.utils.mybatis.Table; import com.google.gson.annotations.Expose; /** * 帮助中心分类 * @@ -16,14 +18,17 @@ @Table("yeshi_ec_help_class") public class HelpClass { @Expose @Column(name = "hc_id") private Long id; // 名称 @Expose @Column(name = "hc_name") private String name; // 图片链接 @Expose @Column(name = "hc_picture") private String picture;
@@ -105,19 +105,19 @@ </if> </select> <select id="queryIdAndTitle" resultMap="BaseResultMap"> <!-- 根据条件查询所有标签 --> <select id="listValid" resultMap="BaseResultMap"> SELECT h_id, h_title FROM yeshi_ec_help_center WHERE 1=1 <if test='key != null and key != ""'> WHERE h_id > #{pageId} AND IF(h_start_time IS NULL,TRUE, h_start_time<![CDATA[<=]]>NOW()) AND IF(h_end_time IS NULL,TRUE, h_end_time >=NOW()) <if test='key != null and key != ""'> AND h_title like '%${key}%' </if> <if test='cid != null'> AND h_cid = #{cid} </if> ORDER BY h_weight DESC, h_createtime LIMIT ${start},${count} ORDER BY h_weight DESC LIMIT ${count} </select> <delete id="deleteBatchById" parameterType="int"> fanli/src/main/java/com/yeshi/fanli/mapping/help/HelpClassMapper.xml
@@ -108,7 +108,9 @@ <select id="getClassByState" resultMap="BaseResultMap"> SELECT hc_id,hc_name,hc_picture FROM yeshi_ec_help_class WHERE hc_show_state = #{state} WHERE hc_show_state = #{state} AND IF(hc_start_time IS NULL,TRUE, hc_start_time<![CDATA[<=]]>NOW()) AND IF(hc_end_time IS NULL,TRUE, hc_end_time >=NOW()) ORDER BY hc_sort </select>
@@ -41,28 +41,24 @@ private AdActivityVersionControlService adActivityVersionControlService; @Override public int insertSelective(HelpCenter record) throws HelpCenterException { return helpCenterMapper.insertSelective(record); } @Override public int updateByPrimaryKey(HelpCenter record) throws HelpCenterException { public int updateByPrimaryKey(HelpCenter record) { return helpCenterMapper.updateByPrimaryKey(record); } @Override public int updateByPrimaryKeySelective(HelpCenter record) throws HelpCenterException { public int updateByPrimaryKeySelective(HelpCenter record) { return helpCenterMapper.updateByPrimaryKeySelective(record); } @Override public HelpCenter selectByPrimaryKey(Long id) throws HelpCenterException { public HelpCenter selectByPrimaryKey(Long id) { return helpCenterMapper.selectByPrimaryKey(id); } @Override public HelpCenter selectByPrimaryKeyCache(Long id) throws HelpCenterException { public HelpCenter selectByPrimaryKeyCache(Long id) { return selectByPrimaryKey(id); } @@ -231,36 +227,35 @@ } @Override public List<HelpCenter> query(int pageIndex, int pageSize, String key, Long cid, Integer orderMode) throws HelpCenterException { public List<HelpCenter> query(int pageIndex, int pageSize, String key, Long cid, Integer orderMode) { return helpCenterMapper.query(pageIndex, pageSize, key, cid, orderMode); } @Override public long countQuery(String key, Long cid) throws HelpCenterException { public long countQuery(String key, Long cid) { return helpCenterMapper.countQuery(key, cid); } @Override @Cacheable(value = "helpCenterCache",key="'queryIdAndTitle-'+#pageIndex+'-'+#key+'-'+#cid") public List<HelpCenter> queryIdAndTitle(int pageIndex, int pageSize, String key, Long cid) throws HelpCenterException { return helpCenterMapper.queryIdAndTitle(pageIndex, pageSize, key, cid); @Cacheable(value = "helpCenterCache",key="'queryIdAndTitle-'+#pageId+'-'+#key+'-'+#cid") public List<HelpCenter> listValid(long pageId, int pageSize, String key, Long cid) { return helpCenterMapper.listValid(pageId, pageSize, key, cid); } @Override public int deleteBatchById(List<String> idList) throws HelpCenterException { public int deleteBatchById(List<String> idList) { return helpCenterMapper.deleteBatchById(idList); } @Override public HelpInfo getHelpInfo(Long id) throws HelpCenterException { public HelpInfo getHelpInfo(Long id) { return mongoDBManager.getHelpInfo(id); } @Override @Cacheable(value = "helpCenterCache",key="'getHelpInfoCache-'+#id") public HelpInfo getHelpInfoCache(Long id) throws HelpCenterException { public HelpInfo getHelpInfoCache(Long id) { return getHelpInfo(id); } @@ -268,16 +263,13 @@ @Override @Transactional(rollbackFor=Exception.class) public void deleteInfoBatchById(List<String> idList) throws HelpCenterException { public void deleteInfoBatchById(List<String> idList) { if (idList != null) { for (String id : idList) { mongoDBManager.removeHelpInfo(Long.parseLong(id)); } } } @Transactional(rollbackFor = Exception.class) @Override fanli/src/main/java/com/yeshi/fanli/service/inter/help/HelpCenterService.java
@@ -11,21 +11,14 @@ public interface HelpCenterService { /** * 插入对象 * @param record * @return * @throws HelpCenterException */ public int insertSelective(HelpCenter record) throws HelpCenterException; /** * 更新当前对象所有数据 * @param record * @return * @throws HelpCenterException */ public int updateByPrimaryKey(HelpCenter record) throws HelpCenterException; public int updateByPrimaryKey(HelpCenter record) ; /** * 选择性更新内容——不为空则更新该字段 @@ -33,7 +26,7 @@ * @return * @throws HelpCenterException */ public int updateByPrimaryKeySelective(HelpCenter record) throws HelpCenterException; public int updateByPrimaryKeySelective(HelpCenter record); @@ -43,10 +36,10 @@ * @return * @throws HelpCenterException */ public HelpCenter selectByPrimaryKey(Long id) throws HelpCenterException; public HelpCenter selectByPrimaryKey(Long id) ; @Cacheable(value = "helpCenterCache") public HelpCenter selectByPrimaryKeyCache(Long id) throws HelpCenterException; public HelpCenter selectByPrimaryKeyCache(Long id); /** @@ -58,10 +51,9 @@ * @param endTime 结束时间 * @return */ public List<HelpCenter> query(int pageIndex, int pageSize, String key, Long cid, Integer orderMode) throws HelpCenterException; public List<HelpCenter> query(int pageIndex, int pageSize, String key, Long cid, Integer orderMode) ; public long countQuery(String key, Long cid) throws HelpCenterException; public long countQuery(String key, Long cid); /** @@ -81,7 +73,7 @@ * @return * @throws HelpCenterException */ public int deleteBatchById(List<String> idList) throws HelpCenterException; public int deleteBatchById(List<String> idList); /** * @@ -89,7 +81,7 @@ * @return * @throws HelpCenterException */ public HelpInfo getHelpInfo(Long id) throws HelpCenterException; public HelpInfo getHelpInfo(Long id); /** * 查询 只返回id、title @@ -99,7 +91,7 @@ * @return * @throws HelpCenterException */ public List<HelpCenter> queryIdAndTitle(int pageIndex, int pageSize, String key, Long cid) throws HelpCenterException; public List<HelpCenter> listValid(long pageId, int pageSize, String key, Long cid); /** @@ -107,10 +99,10 @@ * @param idList * @throws HelpCenterException */ public void deleteInfoBatchById(List<String> idList) throws HelpCenterException; public void deleteInfoBatchById(List<String> idList); public HelpInfo getHelpInfoCache(Long id) throws HelpCenterException; public HelpInfo getHelpInfoCache(Long id); /** * 版本设置
