feats

src/main/java/com/yunzhi/nanyang/controller/ScreenDataController.java

@@ -44,6 +44,9 @@ public class ScreenDataController extends BaseController {
     @Autowired
     ITdDeviceService iTdDeviceService;
 
+    @Autowired
+    TaDeviceJobService taDeviceJobService;
+
 
     @GetMapping("/basic")
     @ApiOperation(value="基本数据统计", notes = "基本数据统计", httpMethod = "GET", response = ResponseBean.class)
@@ -134,4 +137,27 @@ public class ScreenDataController extends BaseController {
         List<TdDevice> result = iTdDeviceService.getListByTypes(typeList);
         return ResponseBean.success(result);
     }
+
+
+
+    @GetMapping("/device-basic")
+    @ApiOperation(value="基本作业数据统计", notes = "基本作业数据统计", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getDeviceBasic() throws Exception {
+        // 农机总数
+        int totalMachineryNum = iTaMachineryService.countBy("1", 1, true);
+        // 设备总数
+        int totalDeviceNum = iTdDeviceService.countBy("1", 1, true);
+        // 在线设备总数
+        int totalOnlineDeviceNum = iTdDeviceService.countBy("online_status", 1, true);
+        //
+        Double totalAreaNum = taDeviceJobService.sumArea();
+
+        List<ChartParam> result = new ArrayList<>();
+        result.add(new ChartParam("totalMachineryNum", totalMachineryNum));
+        result.add(new ChartParam("totalDeviceNum", totalDeviceNum));
+        result.add(new ChartParam("totalOnlineDeviceNum", totalOnlineDeviceNum));
+        result.add(new ChartParam("totalAreaNum", totalAreaNum));
+
+        return ResponseBean.success(result);
+    }
 }

src/main/java/com/yunzhi/nanyang/controller/TdRawDeviceController.java

@@ -117,7 +117,7 @@ public class TdRawDeviceController extends BaseController {
      * @return 实例对象
      */
     @ApiOperation("同步设备")
-    @PutMapping("/raw-device/sync")
+    @PutMapping("/admin/raw-device/sync")
     public ResponseBean sync() throws Exception {
         String url = deviceServer + "/shensong/syncDevice";
         String s = httpUtils.get(url);

src/main/java/com/yunzhi/nanyang/mapper/TaDeviceJobMapper.java

@@ -52,4 +52,6 @@ public interface TaDeviceJobMapper  extends BaseMapper<TaDeviceJob>{
                                  @Param("endDate") String endDate);
 
     List<TaMachinery> getMachineryListByUser(@Param("userId") String userId);
+
+    Double sumArea();
 }

src/main/java/com/yunzhi/nanyang/service/TaDeviceJobService.java

@@ -8,18 +8,21 @@ import java.util.List;
 
 /**
  * 设备作业表;(ta_device_job)表服务接口
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-11-3
  */
 public interface TaDeviceJobService extends IBaseService<TaDeviceJob> {
 
-     IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone);
+    IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone);
 
-     Double statisTotalArea(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone);
+    Double statisTotalArea(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone);
 
-     List<TaDeviceJob> listOrgBy(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone);
+    List<TaDeviceJob> listOrgBy(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone);
 
     IPage<TaDeviceJob> getPageBy(IPage<TaDeviceJob> pg, String deviceKind, String deviceNo, String startDate, String endDate);
 
     List<TaMachinery> getMachineryListByUser(String userId);
+
+    Double sumArea();
 }

src/main/java/com/yunzhi/nanyang/service/impl/TaDeviceJobServiceImpl.java

@@ -42,4 +42,9 @@ public class TaDeviceJobServiceImpl extends BaseServiceImpl<TaDeviceJobMapper, T
     public List<TaMachinery> getMachineryListByUser(String userId) {
         return baseMapper.getMachineryListByUser(userId);
     }
+
+    @Override
+    public Double sumArea() {
+        return baseMapper.sumArea();
+    }
 }

src/main/resources/mapper/TaDeviceJobMapper.xml

@@ -92,4 +92,7 @@
         ORDER BY
             t.create_date DESC
     </select>
+    <select id="sumArea" resultType="java.lang.Double">
+        SELECT SUM(job_area) FROM ta_device_job
+    </select>
 </mapper>