Merge remote-tracking branch 'origin/develop' into develop

zc-business/src/main/java/com/zc/business/controller/BroadcastController.java

@@ -39,7 +39,7 @@ public class BroadcastController extends BaseController {
 
     private static final String SECRET = "21232f297a57a5a743894a0e4a801fc3";
 
-    private static final String CALLBACKURL = "http://10.0.81.209/broadcast/logIn";
+    private static final String CALLBACKURL = "http://10.0.81.202/broadcast/logIn";
 
     private final static String URL = HTTP + "10.0.81.106/api/REST-API/";
 

zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java

@@ -229,6 +229,8 @@ public class DcDeviceController extends BaseController {
         // 将日期列表以逗号分隔并设置为查询条件的值
         props.put("terms[0].value", String.join(",", dateList));
         props.put("paging", false);
+        props.put("sorts[0].order","asc");
+        props.put("sorts[0].name","timestamp");
         AjaxResult ajaxResult = queryDeviceProperties(deviceId, propertyId, props);
         if (!ajaxResult.get("code").equals(200)) {
             return ajaxResult;

zc-business/src/main/java/com/zc/business/controller/StatusController.java

@@ -207,8 +207,11 @@ public class StatusController extends BaseController {
         maps.put("sucessRate",String.format("%.2f", sucessRate)+"%");
         //离线率
         maps.put("failRate",failRate);
+        List<DcDevice> list = dcDeviceService.list();
+        //已使用数量
+        maps.put("sumUseState",String.valueOf(lastEntry.size()));
         //总数
-        maps.put("sum",String.valueOf(lastEntry.size()));
+        maps.put("sum",String.valueOf(list.size()));
         subMap.put("全部设备",maps);
 
         return AjaxResult.success(subMap);

zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java

@@ -116,15 +116,14 @@ public class WeatherForecastController extends BaseController {
         JSONArray meteorologicalEarlyWarning6 = jsonObject.getJSONArray("meteorologicalEarlyWarning6");
         JSONArray meteorologicalEarlyWarning7 = jsonObject.getJSONArray("meteorologicalEarlyWarning7");
         JSONArray meteorologicalEarlyWarning8 = jsonObject.getJSONArray("meteorologicalEarlyWarning8");
-        return AjaxResult.success(meteorologicalEarlyWarning1.size() +
-                meteorologicalEarlyWarning2.size() +
-                meteorologicalEarlyWarning3.size() +
-                meteorologicalEarlyWarning4.size() +
-                meteorologicalEarlyWarning5.size() +
-                meteorologicalEarlyWarning6.size() +
-                meteorologicalEarlyWarning7.size() +
-                meteorologicalEarlyWarning8.size()
-        );
+        return AjaxResult.success((meteorologicalEarlyWarning1 == null ? 0 : meteorologicalEarlyWarning1.size()) +
+                (meteorologicalEarlyWarning2 == null ? 0 : meteorologicalEarlyWarning2.size()) +
+                (meteorologicalEarlyWarning3 == null ? 0 : meteorologicalEarlyWarning3.size()) +
+                (meteorologicalEarlyWarning4 == null ? 0 : meteorologicalEarlyWarning4.size()) +
+                (meteorologicalEarlyWarning5 == null ? 0 : meteorologicalEarlyWarning5.size()) +
+                (meteorologicalEarlyWarning6 == null ? 0 : meteorologicalEarlyWarning6.size()) +
+                (meteorologicalEarlyWarning7 == null ? 0 : meteorologicalEarlyWarning7.size()) +
+                (meteorologicalEarlyWarning8 == null ? 0 : meteorologicalEarlyWarning8.size()));
 
     }
 

zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml

@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="longitude"    column="longitude"/>
         <result property="latitude"    column="latitude"/>
         <result property="childType"    column="child_type"/>
+        <result property="manufacturer"    column="manufacturer"/>
     </resultMap>
 
     <resultMap id="dcStakeMarkResult" type="dcStakeMark">
@@ -73,9 +74,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select t1.id, t1.iot_device_id, t1.group_id, t1.product_id, t1.stake_mark, t1.direction, t1.device_name, t1.device_code, t1.device_type,
         t1.installation_Date,t1.production_date,t1.durable_years,t1.installation_site,t1.use_state,t1.device_state,t1.other_config,t1.remark,
         t1.create_time,t1.update_time,t1.facilities_type,t1.device_ip,t1.stake_mark_range,t1.device_img,t1.child_type,
-        t1.facilities_type,t2.longitude,t2.latitude
+        t1.facilities_type,t2.longitude,t2.latitude,t3.manufacturer
         from dc_device t1
         left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark and t1.direction = t2.direction
+        left join dc_product t3 on t3.id = t1.product_id
         <where>
             <if test="id != null  and id != ''">and t1.id = #{id}</if>
             <if test="iotDeviceId != null  and iotDeviceId != ''">and t1.iot_device_id = #{iotDeviceId}</if>