Merge branch 'master' of http://git.dgtis.com/qxp/suishenbang-oneportal

suishenbang-system/src/main/java/com/dgtly/system/mapper/SysRidingLanternMapper.java

@@ -58,4 +58,7 @@ public interface SysRidingLanternMapper
      * @return 结果
      */
     public int deleteSysRidingLanternByIds(String[] ids);
+
+    /**有效的通知通告*/
+    public List<SysRidingLantern> selectLanternList();
 }

suishenbang-system/src/main/java/com/dgtly/system/service/ISysRidingLanternService.java

@@ -58,4 +58,7 @@ public interface ISysRidingLanternService
      * @return 结果
      */
     public int deleteSysRidingLanternById(Long id);
+
+    /**有效的通知公告*/
+    public List<SysRidingLantern> selectLanternList();
 }

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysRidingLanternServiceImpl.java

@@ -94,4 +94,12 @@ public class SysRidingLanternServiceImpl implements ISysRidingLanternService
     {
         return sysRidingLanternMapper.deleteSysRidingLanternById(id);
     }
+
+    /**
+     * 有效的通知公告
+     */
+    @Override
+    public List<SysRidingLantern> selectLanternList() {
+        return sysRidingLanternMapper.selectLanternList();
+    }
 }

suishenbang-system/src/main/resources/mapper/system/SysRidingLanternMapper.xml

@@ -96,5 +96,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-    
+
+    <select id="selectLanternList"  resultMap="SysRidingLanternResult">
+        <include refid="selectSysRidingLanternVo"/>
+        where is_delete = 0
+        and  (SELECT CURDATE()) &lt;= end_time
+        and end_time is  not  null
+    </select>
 </mapper>

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxPortalController.java

@@ -52,6 +52,8 @@ public class WxPortalController extends ApiBaseController {
     private IAssRelcustomerinfoService assRelcustomerinfoService;
     @Autowired
     private ISysMagnetLogService sysMagnetLogService;
+    @Autowired
+    private ISysRidingLanternService sysRidingLanternService;
 
 
     @ApiOperation(value = "微信门户首页",notes = "参数：{userId:1}")
@@ -68,6 +70,19 @@ public class WxPortalController extends ApiBaseController {
         return AjaxResult.success().putKV("magnets",wxMagnetList).putKV("banners",wxBannerList);
     }
 
+    @ApiOperation(value = "通知公告")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "params" , paramType = "body")
+    })
+    @PostMapping("/ridingLantern")
+    public Object getRidingLantern(){
+        List<SysRidingLantern> lanternList=sysRidingLanternService.selectLanternList();
+        if(lanternList !=null && lanternList.size()>0){
+        return AjaxResult.success().putKV("lanterns",lanternList);
+        }else{
+        return AjaxResult.error("暂无通知");
+    }
+    }
     /**
      * 新增保存磁铁日志
      */