Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/api/hpslide/HpSlideControllerAPI.java

@@ -1,10 +1,10 @@
 package com.jeeplus.modules.api.hpslide;
 
-import com.google.common.collect.Lists;
-import com.jeeplus.common.config.Global;
 import com.jeeplus.modules.api.sys.BaseAppController;
+import com.jeeplus.modules.hpadvertisement.service.HpAdvBannerService;
 import com.jeeplus.modules.utils.ErrorCode;
 import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,17 +15,15 @@ import org.springframework.web.servlet.view.json.MappingJackson2JsonView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @Api(value = "开心工作轮播图相关API", description = "岗位请求")
 @Controller
 @RequestMapping("${frontPath}/api/slide")
 public class HpSlideControllerAPI extends BaseAppController {
-    private static final String BANNER1 = "/uploadfiles/banner/banner1/banner1.jpg";
-    private static final String BANNER2 = "/uploadfiles/banner/banner2/banner2.jpg";
-    private static final String BANNER3 = "/uploadfiles/banner/banner3/banner3.jpg";
-    private static final String BANNER4 = "/uploadfiles/banner/banner4/banner4.jpg";
+
+    @Autowired
+    private HpAdvBannerService hpAdvBannerService;
 
     /**
      * 首页banner
@@ -41,12 +39,7 @@ public class HpSlideControllerAPI extends BaseAppController {
         Map<String, String> requestMap = findRequestMap(request);
         Map<String, Object> obj = null;
         try {
-            List list = Lists.newArrayList();
-            list.add(Global.getAliyunUrl() + BANNER1);
-            list.add(Global.getAliyunUrl() + BANNER2);
-            list.add(Global.getAliyunUrl() + BANNER3);
-            list.add(Global.getAliyunUrl() + BANNER4);
-            returnMap.put("bannerList", list);
+            returnMap = hpAdvBannerService.findBannerList(requestMap);
             obj = successResult(ErrorCode.code_1000, "", returnMap);
         } catch (Exception e) {
             System.out.println("Exception e:" + e);

src/main/java/com/jeeplus/modules/hpadvertisement/mapper/HpAdvBannerMapper.java

@@ -7,6 +7,8 @@ import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.hpadvertisement.entity.HpAdvBanner;
 
+import java.util.List;
+
 /**
  * 广告位MAPPER接口
  * @author zwq
@@ -14,5 +16,7 @@ import com.jeeplus.modules.hpadvertisement.entity.HpAdvBanner;
  */
 @MyBatisMapper
 public interface HpAdvBannerMapper extends BaseMapper<HpAdvBanner> {
-	
+
+
+    List<HpAdvBanner> findBannerList(HpAdvBanner hpAdvBanner);
 }

src/main/java/com/jeeplus/modules/hpadvertisement/mapper/xml/HpAdvBannerMapper.xml

@@ -54,6 +54,7 @@
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
+				ORDER BY a.sort ASC, a.update_time DESC
 			</otherwise>
 		</choose>
 	</select>
@@ -143,5 +144,24 @@
 	<select id="findUniqueByProperty" resultType="HpAdvBanner" statementType="STATEMENT">
 		select * FROM hp_adv_banner  where ${propertyName} = '${value}'
 	</select>
-	
+
+	<select id="findBannerList" resultType="HpAdvBanner">
+		SELECT
+		<include refid="hpAdvBannerColumns"/>
+		FROM hp_adv_banner a
+		<include refid="hpAdvBannerJoins"/>
+		<where>
+			a.del_flag = 0
+			<if test="application != null ">
+				<if test="application == 0">
+					and (a.application = 0 or 2)
+				</if>
+				<if test="application == 1">
+					and (a.application = 1 or 2)
+				</if>
+			</if>
+		</where>
+		ORDER BY a.sort ASC, a.update_time DESC
+	</select>
+
 </mapper>

src/main/java/com/jeeplus/modules/hpadvertisement/service/HpAdvBannerService.java

@@ -6,8 +6,12 @@ package com.jeeplus.modules.hpadvertisement.service;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+import com.jeeplus.common.config.Global;
+import com.jeeplus.common.utils.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -65,4 +69,28 @@ public class HpAdvBannerService extends CrudService<HpAdvBannerMapper, HpAdvBann
         super.delete(hpAdvBanner);
     }
 
+    /**
+     * banner位接口
+     *
+     * @param requestMap
+     * @return
+     */
+    public Map<String, Object> findBannerList(Map<String, String> requestMap) {
+        Map<String, Object> returnMap = new HashMap<String, Object>();
+        String application = requestMap.get("application");
+        HpAdvBanner hpAdvBanner = new HpAdvBanner();
+        if (StringUtils.isNotBlank(application)) {
+            hpAdvBanner.setApplication(Integer.parseInt(application));
+        }
+        List<HpAdvBanner> list = mapper.findBannerList(hpAdvBanner);
+        for (HpAdvBanner hpAdvBanner1 : list) {
+            if (StringUtils.isNotBlank(hpAdvBanner1.getPicUrl())) {
+                if (!hpAdvBanner1.getPicUrl().contains("http")) {
+                    hpAdvBanner1.setPicUrl(Global.getAliyunUrl() + hpAdvBanner1.getPicUrl());
+                }
+            }
+        }
+        returnMap.put("bannerList", list);
+        return returnMap;
+    }
 }