代码优化

project-common/src/main/java/com/project/common/utils/http/HttpUtils.java

@@ -1,6 +1,7 @@
 package com.project.common.utils.http;
 
 import com.project.common.constant.Constants;
+import com.project.common.exception.ServiceException;
 import com.project.common.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -59,6 +60,10 @@ public class HttpUtils {
             log.info("sendGet - {}", urlNameString);
             URL realUrl = new URL(urlNameString);
             URLConnection connection = realUrl.openConnection();
+            // 设置连接超时时间为5000毫秒（5秒）
+            connection.setConnectTimeout(5000);
+            // 设置读取超时时间为60000毫秒（60秒）
+            connection.setReadTimeout(60000);
             connection.setRequestProperty("accept", "*/*");
             connection.setRequestProperty("connection", "Keep-Alive");
             connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
@@ -71,12 +76,16 @@ public class HttpUtils {
             log.info("recv - {}", result);
         } catch (ConnectException e) {
             log.error("调用HttpUtils.sendGet ConnectException, url=" + url + ",param=" + param, e);
+            throw new ServiceException(e.getMessage());
         } catch (SocketTimeoutException e) {
             log.error("调用HttpUtils.sendGet SocketTimeoutException, url=" + url + ",param=" + param, e);
+            throw new ServiceException(e.getMessage());
         } catch (IOException e) {
             log.error("调用HttpUtils.sendGet IOException, url=" + url + ",param=" + param, e);
+            throw new ServiceException(e.getMessage());
         } catch (Exception e) {
             log.error("调用HttpsUtil.sendGet Exception, url=" + url + ",param=" + param, e);
+            throw new ServiceException(e.getMessage());
         } finally {
             try {
                 if (in != null) {
@@ -180,13 +189,17 @@ public class HttpUtils {
             }
             log.info("recv - {}", result);
         } catch (ConnectException e) {
-            log.error("调用HttpUtils.sendPost ConnectException, url=" + url + ",param=" + param, e);
+            throw new ServiceException(e.getMessage());
+            //log.error("调用HttpUtils.sendPost ConnectException, url=" + url + ",param=" + param, e);
         } catch (SocketTimeoutException e) {
             log.error("调用HttpUtils.sendPost SocketTimeoutException, url=" + url + ",param=" + param, e);
+            throw new ServiceException(e.getMessage());
         } catch (IOException e) {
             log.error("调用HttpUtils.sendPost IOException, url=" + url + ",param=" + param, e);
+            throw new ServiceException(e.getMessage());
         } catch (Exception e) {
             log.error("调用HttpsUtil.sendPost Exception, url=" + url + ",param=" + param, e);
+            throw new ServiceException(e.getMessage());
         } finally {
             try {
                 if (out != null) {

project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatGreenSmartController.java

@@ -78,10 +78,16 @@ public class PlatGreenSmartController extends BaseController {
 //    }
 
 //
-//    @RequestMapping("/getFoodRankData")
-//    public AjaxResult getFoodRankData(@RequestParam String appOrg) {
-//        return AjaxResult.success("查询成功", iPlatGreenSmartRankService.getRankData(appOrg));
-//    }
+
+    /**
+     * 热销菜品排行
+     * @param appOrg
+     * @return
+     */
+    @RequestMapping("/getFoodRankData")
+    public AjaxResult getFoodRankData(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", iPlatGreenSmartRankService.getRankData(appOrg));
+    }
 
     @RequestMapping("/getCanteenStaff")
     public AjaxResult getCanteenStaff(@RequestParam String appOrg) {

project-zcustom/src/main/java/com/project/zcustom/service/basics/impl/PlatAppOrgServiceImpl.java

@@ -1,17 +1,17 @@
 package com.project.zcustom.service.basics.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.project.common.core.domain.search.PageParamVo;
+import com.project.common.utils.StringUtils;
 import com.project.zcustom.domain.basics.PlatAppOrg;
 import com.project.zcustom.mapper.basics.PlatAppOrgMapper;
 import com.project.zcustom.service.basics.IPlatAppOrgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.project.common.utils.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -41,6 +41,9 @@ public class PlatAppOrgServiceImpl extends ServiceImpl<PlatAppOrgMapper, PlatApp
         if (StringUtils.isNotBlank(platAppOrg.getAppOrg())) {
             lqw.eq(PlatAppOrg::getAppOrg, platAppOrg.getAppOrg());
         }
+        if (StringUtils.isNotBlank(platAppOrg.getConnectFlag())) {
+            lqw.eq(PlatAppOrg::getConnectFlag, platAppOrg.getConnectFlag());
+        }
         if (StringUtils.isNotBlank(platAppOrg.getAppName())) {
             lqw.like(PlatAppOrg::getAppName, platAppOrg.getAppName());
         }
@@ -84,6 +87,7 @@ public class PlatAppOrgServiceImpl extends ServiceImpl<PlatAppOrgMapper, PlatApp
      */
     @Override
     public List<PlatAppOrg> selectPlatAppOrgList(PlatAppOrg platAppOrg) {
+        platAppOrg.setConnectFlag("1");
         LambdaQueryWrapper<PlatAppOrg> lqw = getLambdaQueryWrapper(platAppOrg);
         // 排序 默认时间倒序
         lqw.orderByAsc(PlatAppOrg::getId);

project-zcustom/src/main/java/com/project/zcustom/service/smart/impl/PlatBuildingServiceImpl.java

@@ -314,8 +314,12 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
 
     public JSONArray getThisAmmeterDetail(String type){
         // TODO
-        /*return JSONArray.parseArray(buildingService.repeat(ApiUrlConfig.getControlElectricityDetail(), "type=" + type));*/
-        String str = "[\n" +
+        String result = buildingService.repeat(ApiUrlConfig.getControlElectricityDetail(), "type=" + type);
+        if (StringUtils.isNotBlank(result)){
+            return JSONArray.parseArray(result);
+        }
+        return new JSONArray();
+        /*String str = "[\n" +
                 "        {\n" +
                 "            \"number\": \"1# 1-3\",\n" +
                 "            \"EqName\": \"设备名称\",\n" +
@@ -347,7 +351,7 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
                 "            \"Kwh\": \"56.2\",\n" +
                 "        },\n" +
                 "    ]";
-        return JSONArray.parseArray(str);
+        return JSONArray.parseArray(str);*/
     }
 
     public List<Map<String, Object>> getTodayElectricity(){
@@ -418,10 +422,12 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
 
     public JSONArray getAbnormalPoint(String type){
         // TODO
-        /*
-        return JSONArray.parseArray(buildingService.repeat(ApiUrlConfig.getControlAlertDetails(), "type=" + type));
-        */
-        String str = "[\n" +
+        String result = buildingService.repeat(ApiUrlConfig.getControlAlertDetails(), "type=" + type);
+        if (StringUtils.isNotBlank(result)){
+            return JSONArray.parseArray(result);
+        }
+        return new JSONArray();
+        /*String str = "[\n" +
                 "        {\n" +
                 "            \"alertTime\": \"2025-01-01 15:12:11\",\n" +
                 "            \"alertName\": \"液位过低\",\n" +
@@ -437,7 +443,7 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
                 "            \"alertPosition\": \"B2层2号配电室\"\n" +
                 "        }\n" +
                 "    ]";
-        return JSONArray.parseArray(str);
+        return JSONArray.parseArray(str);*/
     }
 
     public JSONArray getWarnEvent(){

project-zcustom/src/main/java/com/project/zcustom/service/smart/impl/PlatGreenSmartServiceImpl.java

@@ -335,9 +335,7 @@ public class PlatGreenSmartServiceImpl extends ServiceImpl<PlatGreenSmartMapper,
         }
         queryWrapper.select("canteen_num","(sum(dish_hygiene_score+taste_dishes_score+attitude_score+tableware_score+types_dishes_score+dining_score) / count(id)) as total_score").groupBy("canteen_num").orderByDesc("total_score").last("limit "+limit);
         List<PlatGreenSmart> smartList = this.list(queryWrapper);
-        if(smartList.isEmpty()){
-            return new HashMap<>();
-        }
+
         // 创建一个中文语言环境的 Collator 实例
         Collator collator = Collator.getInstance(Locale.CHINA);
 

project-zcustom/src/main/java/com/project/zcustom/tools/BuildingService.java

@@ -106,8 +106,7 @@ public class BuildingService {
                     JSONObject jsonObject = JSONObject.parseObject(res);
                     result = jsonObject.getString("data");
                 }
-            }
-            else {
+            } else {
                 String res = HttpUtils.sendGet(url);
                 if (StringUtils.isNotBlank(res)){
                     JSONObject jsonObject = JSONObject.parseObject(res);
@@ -115,14 +114,14 @@ public class BuildingService {
                 }
             }
 
-            // 添加接口请求记录
-            PlatApiRecord platApiRecord = new PlatApiRecord();
-            platApiRecord.setApiUrl(url);
-            platApiRecord.setApiResult(result);
-            iPlatApiRecordService.save(platApiRecord);
-        }catch (Exception e){
-            e.printStackTrace();
+        } catch (Exception e){
+            result = e.getMessage();
         }
+        // 添加接口请求记录
+        PlatApiRecord platApiRecord = new PlatApiRecord();
+        platApiRecord.setApiUrl(url);
+        platApiRecord.setApiResult(result);
+        iPlatApiRecordService.save(platApiRecord);
         return result;
     }
 }

project-zcustom/src/main/java/com/project/zcustom/tools/LogisticsService.java

@@ -116,16 +116,26 @@ public class LogisticsService {
     }
 
 
-    public JSONObject repeat(String url){
+    private JSONObject repeat(String url){
         try {
+
             String res = HttpUtils.sendPost(url,"");
+            PlatApiRecord platApiRecord = new PlatApiRecord();
+            platApiRecord.setApiUrl(url);
+            platApiRecord.setApiResult(res);
+            iPlatApiRecordService.save(platApiRecord);
+
             if (StringUtils.isNotBlank(res)){
                 JSONObject jsonObject = JSONObject.parseObject(res);
                 return jsonObject;
             }
         }catch (Exception e){
-            e.printStackTrace();
+            PlatApiRecord platApiRecord = new PlatApiRecord();
+            platApiRecord.setApiUrl(url);
+            platApiRecord.setApiResult(e.getMessage());
+            iPlatApiRecordService.save(platApiRecord);
         }
         return null;
     }
+
 }