产品仪器页面静态化

src/main/java/com/caimei/modules/cmpage/web/CmPageCentreController.java

@@ -5,6 +5,7 @@ import com.caimei.modules.cmpage.entity.CmPageCentre;
 import com.caimei.modules.cmpage.service.CmImageService;
 import com.caimei.modules.cmpage.service.CmPageCentreService;
 import com.caimei.modules.newhome.entity.NewPageFloorContent;
+import com.caimei.modules.opensearch.GenerateUtils;
 import com.caimei.modules.product.entity.ActType;
 import com.caimei.modules.product.service.ActTypeService;
 import com.caimei.redis.RedisService;
@@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -51,6 +53,8 @@ public class CmPageCentreController extends BaseController {
 
     @Autowired
     private RedisService redisService;
+    @Resource
+    private GenerateUtils generateUtils;
 
     @ModelAttribute
     public CmPageCentre get(@RequestParam(required = false) String id) {
@@ -109,7 +113,7 @@ public class CmPageCentreController extends BaseController {
         addMessage(redirectAttributes, "保存成功");
         if ("5".equals(cmPageCentre.getType())) {
             //清除产品仪器缓存
-            redisService.removePattern("instrumentData*");redisService.removePattern("insCommodityData*");
+            cleanRedisCache();
         } else if ("6".equals(cmPageCentre.getType())) {
             //清除活动专题缓存
             redisService.removePattern("activityData*");
@@ -121,6 +125,10 @@ public class CmPageCentreController extends BaseController {
     @RequestMapping(value = "delete")
     public String delete(CmPageCentre cmPageCentre, RedirectAttributes redirectAttributes) {
         cmPageCentreService.delete(cmPageCentre);
+        if ("5".equals(cmPageCentre.getType())) {
+            //清除产品仪器缓存
+            cleanRedisCache();
+        }
         if ("6".equals(cmPageCentre.getType())) {
             //清除活动专题缓存
             redisService.removePattern("activityData*");
@@ -138,6 +146,7 @@ public class CmPageCentreController extends BaseController {
             cmPageCentreService.updateEnabledStatusByIds(enabledStatus, ids);
             map.put("success", true);
             map.put("msg", "修改成功");
+            cleanRedisCache();
         } catch (Exception e) {
             logger.debug(e.toString(), e);
             map.put("success", false);
@@ -155,6 +164,7 @@ public class CmPageCentreController extends BaseController {
             cmPageCentreService.updateCrmEnabledStatusByIds(crmEnabledStatus, ids);
             map.put("success", true);
             map.put("msg", "修改成功");
+            cleanRedisCache();
         } catch (Exception e) {
             logger.debug(e.toString(), e);
             map.put("success", false);
@@ -206,7 +216,7 @@ public class CmPageCentreController extends BaseController {
                 }
             }
             //清除产品仪器缓存
-            redisService.removePattern("instrumentData*");redisService.removePattern("insCommodityData*");
+            cleanRedisCache();
             //清除活动专题缓存
             redisService.removePattern("activityData*");
             map.put("success", true);
@@ -231,4 +241,14 @@ public class CmPageCentreController extends BaseController {
         }
         return "modules/newhome/newPageFloorContentForm";
     }
+
+    public void cleanRedisCache() {
+        //清除产品仪器缓存
+        redisService.removePattern("instrumentData*");
+        redisService.removePattern("insCommodityData*");
+        // 重新生成静态产品仪器页
+        generateUtils.generateProductType(286);
+        generateUtils.generateProductType(287);
+    }
+
 }

src/main/java/com/caimei/modules/cmpage/web/CmPageController.java

@@ -6,6 +6,7 @@ import com.caimei.modules.cmpage.entity.CmPageHotSearch;
 import com.caimei.modules.cmpage.entity.PageNameContent;
 import com.caimei.modules.cmpage.service.CmPageService;
 import com.caimei.modules.opensearch.CoreServiceUitls;
+import com.caimei.modules.opensearch.GenerateUtils;
 import com.caimei.redis.RedisService;
 import com.caimei.utils.StringUtil;
 import com.caimei.utils.StringUtils;
@@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -48,6 +50,8 @@ public class CmPageController extends BaseController {
 
     @Autowired
     private RedisService redisService;
+    @Resource
+    private GenerateUtils generateUtils;
 
     @ModelAttribute
     public CmPage get(@RequestParam(required = false) String id) {
@@ -224,5 +228,11 @@ public class CmPageController extends BaseController {
         if (redisService.exists(getSearchHotWord)) {
             redisService.remove(getSearchHotWord);
         }
+        //清除产品仪器缓存
+        redisService.removePattern("instrumentData*");
+        redisService.removePattern("insCommodityData*");
+        // 重新生成静态产品仪器页
+        generateUtils.generateProductType(286);
+        generateUtils.generateProductType(287);
     }
 }

src/main/java/com/caimei/modules/newhome/web/NewPageFirstNavigationController.java

@@ -211,8 +211,14 @@ public class NewPageFirstNavigationController extends BaseController {
             redisService.removePattern("getCommodityClassify*");
             redisService.removePattern("getHomeData*");
             redisService.removePattern("getHomeCommodityData*");
+            //清除产品仪器缓存
+            redisService.removePattern("instrumentData*");
+            redisService.removePattern("insCommodityData*");
             // 重新生成静态首页
             generateUtils.generateHome();
+            // 重新生成静态产品仪器页
+            generateUtils.generateProductType(286);
+            generateUtils.generateProductType(287);
             map.put("success", true);
             map.put("msg", "手动生成静态首页成功");
             return map;
@@ -232,5 +238,8 @@ public class NewPageFirstNavigationController extends BaseController {
         redisService.removePattern(getNavMenu);
         // 重新生成静态首页
         generateUtils.generateHome();
+        // 重新生成静态产品仪器页
+        generateUtils.generateProductType(286);
+        generateUtils.generateProductType(287);
     }
 }

src/main/java/com/caimei/modules/opensearch/GenerateUtils.java

@@ -19,6 +19,9 @@ public class GenerateUtils {
 
 	protected Logger logger = LoggerFactory.getLogger(getClass());
 
+    /**
+     * 生成www静态首页
+     */
     public void generateHome(){
         try {
             // 获取www服务器地址
@@ -35,4 +38,24 @@ public class GenerateUtils {
         }
     }
 
+    /**
+     * 生成www静态产品仪器页面
+     * @param pageId 页面Id
+     */
+    public void generateProductType(Integer pageId){
+        try {
+            // 获取www服务器地址
+            String wwwServer = Global.getConfig("wwwServer");
+            RestTemplate restTemplate = new RestTemplate();
+            MultiValueMap<String, Integer> paramMap = new LinkedMultiValueMap<>();
+            String uri = wwwServer + "/generate/product/type?pageId="+pageId;
+            // 发起Post请求
+            String result = restTemplate.postForObject(uri, paramMap, String.class);
+            logger.info("生成www静态产品仪器页面：" + result);
+        }  catch (Exception e) {
+            logger.info("生成www静态产品仪器页面失败！");
+            logger.error(e.toString(), e);
+        }
+    }
+
 }

src/main/java/com/caimei/modules/product/web/CmBigtypeController.java

@@ -231,6 +231,9 @@ public class CmBigtypeController extends BaseController {
 		redisService.removePattern("getCommodityClassify*");
         // 重新生成静态首页
         generateUtils.generateHome();
+		// 重新生成静态产品仪器页
+		generateUtils.generateProductType(286);
+		generateUtils.generateProductType(287);
 	}
 
 }

src/main/java/com/caimei/modules/product/web/ProductNewController.java

@@ -880,9 +880,14 @@ public class ProductNewController extends BaseController {
         String homeData = "getHomeData*";
         redisService.removePattern(homeData);
         redisService.removePattern("getHomeCommodityData*");
+        //清除产品仪器缓存
+        redisService.removePattern("instrumentData*");
         redisService.removePattern("insCommodityData*");
         // 重新生成静态首页
         generateUtils.generateHome();
+        // 重新生成静态产品仪器页
+        generateUtils.generateProductType(286);
+        generateUtils.generateProductType(287);
     }
 }
 

src/main/resources/mappings/jeesite/test/TestDataChildDao.xml

@@ -18,7 +18,7 @@
 		LEFT JOIN test_data_main b ON b.id = a.test_data_main_id
 	</sql>
     
-	<select id="get" resultType="TestDataChild">
+	<select id="get" resultType="com.thinkgem.jeesite.test.entity.TestDataChild">
 		SELECT 
 			<include refid="testDataChildColumns"/>
 		FROM test_data_child a
@@ -26,7 +26,7 @@
 		WHERE a.id = #{id}
 	</select>
 	
-	<select id="findList" resultType="TestDataChild">
+	<select id="findList" resultType="com.thinkgem.jeesite.test.entity.TestDataChild">
 		SELECT 
 			<include refid="testDataChildColumns"/>
 		FROM test_data_child a
@@ -53,7 +53,7 @@
 		</choose>
 	</select>
 	
-	<select id="findAllList" resultType="TestDataChild">
+	<select id="findAllList" resultType="com.thinkgem.jeesite.test.entity.TestDataChild">
 		SELECT 
 			<include refid="testDataChildColumns"/>
 		FROM test_data_child a

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageList.jsp

@@ -181,8 +181,37 @@
             </td>
             <td>   <c:if test="${cmPage.type ne 4 && cmPage.type ne 5}"><img src="${cmPage.headImage}" style="width: 160px;height: 100px;"> </c:if></td>
             <td>
-                <a href="${fns:getConfig('wwwServer')}cmpage/info-${cmPage.type}-${cmPage.id}.html" target="_blank">${fns:getConfig('wwwServer')}cmpage/info-${cmPage.type}-${cmPage.id}.html</a>
-
+                <c:if test="${cmPage.type eq 1}">
+                    <c:if test="${cmPage.id eq 189}">
+                        <a href="${fns:getConfig('wwwServer')}flea-market/list.html" target="_blank">${fns:getConfig('wwwServer')}flea-market/list.html</a>
+                    </c:if>
+                    <c:if test="${cmPage.id ne 189}">
+                        <a href="${fns:getConfig('wwwServer')}topic-${cmPage.id}.html" target="_blank">${fns:getConfig('wwwServer')}topic-${cmPage.id}.html</a>
+                    </c:if>
+                </c:if>
+                <c:if test="${cmPage.type eq 2}">
+                    <a href="${fns:getConfig('wwwServer')}equipment-${cmPage.id}.html" target="_blank">${fns:getConfig('wwwServer')}equipment-${cmPage.id}.html</a>
+                </c:if>
+                <c:if test="${cmPage.type eq 3}">
+                    <a href="${fns:getConfig('wwwServer')}live.html" target="_blank">${fns:getConfig('wwwServer')}live.html</a>
+                </c:if>
+                <c:if test="${cmPage.type eq 4}">
+                    <a href="${fns:getConfig('wwwServer')}page-${cmPage.id}.html" target="_blank">${fns:getConfig('wwwServer')}page-${cmPage.id}.html</a>
+                </c:if>
+                <c:if test="${cmPage.type eq 5}">
+                    <c:if test="${cmPage.id eq 301}">
+                        <a href="${fns:getConfig('wwwServer')}product/activity-301.html" target="_blank">${fns:getConfig('wwwServer')}product/activity-301.html</a>
+                    </c:if>
+                    <c:if test="${cmPage.id ne 301}">
+                        <a href="${fns:getConfig('wwwServer')}product/type-${cmPage.id}.html" target="_blank">${fns:getConfig('wwwServer')}product/type-${cmPage.id}.html</a>
+                    </c:if>
+                </c:if>
+                <c:if test="${cmPage.type eq 6}">
+                    <a href="${fns:getConfig('wwwServer')}product/activity-${cmPage.id}.html" target="_blank">${fns:getConfig('wwwServer')}product/activity-${cmPage.id}.html</a>
+                </c:if>
+                <c:if test="${cmPage.type ne 1 && cmPage.type ne 2 && cmPage.type ne 3 && cmPage.type ne 4 && cmPage.type ne 5 && cmPage.type ne 6}">
+                    <a href="${fns:getConfig('wwwServer')}cmpage/info-${cmPage.type}-${cmPage.id}.html" target="_blank">${fns:getConfig('wwwServer')}cmpage/info-${cmPage.type}-${cmPage.id}.html</a>
+                </c:if>
             </td>
             <td>
                 <shiro:hasPermission name="cmpage:cmPage:edit">