feats

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

@@ -47,6 +47,9 @@ public class ScreenDataController extends BaseController {
     @Autowired
     TaDeviceJobService taDeviceJobService;
 
+    @Autowired
+    TdRawDeviceService tdRawDeviceService;
+
 
     @GetMapping("/basic")
     @ApiOperation(value="基本数据统计", notes = "基本数据统计", httpMethod = "GET", response = ResponseBean.class)
@@ -146,9 +149,9 @@ public class ScreenDataController extends BaseController {
         // 农机总数
         int totalMachineryNum = iTaMachineryService.countBy("1", 1, true);
         // 设备总数
-        int totalDeviceNum = iTdDeviceService.countBy("1", 1, true);
+        int totalDeviceNum = tdRawDeviceService.countBy("1", 1, false);
         // 在线设备总数
-        int totalOnlineDeviceNum = iTdDeviceService.countBy("online_status", 1, true);
+        int totalOnlineDeviceNum = tdRawDeviceService.countBy("device_status", 1, false);
         //
         Double totalAreaNum = taDeviceJobService.sumArea();
 

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

@@ -67,7 +67,7 @@ public class SysUserController extends BaseController {
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean sysUserList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                     @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                    @ApiParam("机构") @RequestParam(value ="org_id", required = false) String orgId,
+                                    @ApiParam("机构") @RequestParam(value ="orgId", required = false) String orgId,
                                     @ApiParam("名称") @RequestParam(value ="userName", required = false) String userName,
                                     @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone) throws Exception{
 

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

@@ -4,17 +4,17 @@ import com.alibaba.fastjson.JSONObject;
 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.yunzhi.nanyang.common.BaseController;
-import com.yunzhi.nanyang.common.HttpUtils;
-import com.yunzhi.nanyang.common.ResponseBean;
+import com.yunzhi.nanyang.common.*;
 
 import java.time.LocalDateTime;
 import java.util.List;
 
-import com.yunzhi.nanyang.common.StringUtils;
+import com.yunzhi.nanyang.entity.TdDevice;
+import com.yunzhi.nanyang.service.ITdDeviceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -41,6 +41,9 @@ public class TdRawDeviceController extends BaseController {
     @Autowired
     private TdRawDeviceService tdRawDeviceService;
 
+    @Autowired
+    private ITdDeviceService iTdDeviceService;
+
 //    /** 
 //     * 通过ID查询单条数据 
 //     *
@@ -107,6 +110,7 @@ public class TdRawDeviceController extends BaseController {
         tdRawDevice.setDeviceStatus(0); // 默认离线
         tdRawDevice.setCreateDate(LocalDateTime.now());
         tdRawDeviceService.save(tdRawDevice);
+
         return ResponseBean.success(tdRawDevice);
     }
 
@@ -123,17 +127,29 @@ public class TdRawDeviceController extends BaseController {
         String s = httpUtils.get(url);
         return JSONObject.parseObject(s, ResponseBean.class);
     }
-//    
-//    /** 
-//     * 通过主键删除数据
-//     *
-//     * @param deviceId 主键
-//     * @return 是否成功
-//     */
-//    @ApiOperation("通过主键删除数据")
-//    @DeleteMapping("/raw-device/{id}")
-//    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
-//        tdRawDeviceService.removeLogicById(id);
-//        return ResponseBean.success("success");
-//    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param deviceId 主键
+     * @return 是否成功
+     */
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/admin/raw-device/{id}")
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
+
+        TdRawDevice tdRawDevice = tdRawDeviceService.getById(id);
+        if (null == tdRawDevice) {
+            return ResponseBean.error("未找到数据");
+        }
+
+        TdDevice tdDevice = iTdDeviceService.getExistByDevice(tdRawDevice.getDeviceKind(), tdRawDevice.getDeviceNo());
+        if (null != tdDevice) {
+            tdDevice.setStatus(Constants.STATUS_DELETE);
+            iTdDeviceService.updateById(tdDevice);
+        }
+
+        tdRawDeviceService.removeById(id);
+        return ResponseBean.success("success");
+    }
 }

src/main/java/com/yunzhi/nanyang/entity/TaMachinery.java

@@ -67,6 +67,9 @@ public class TaMachinery implements Serializable {
     @ApiModelProperty(value = "当前位置")
     private String location;
 
+    @ApiModelProperty(value = "位置信息")
+    private String locAddr;
+
     @ApiModelProperty(value = "APP 注册状态")
     private String appStatus;
 

src/main/java/com/yunzhi/nanyang/entity/TdDevice.java

@@ -51,6 +51,9 @@ public class TdDevice implements Serializable {
     @ApiModelProperty(value = "定位")
     private String location;
 
+    @ApiModelProperty(value = "位置信息")
+    private String address;
+
     @ApiModelProperty(value = "在线状态")
     private Integer onlineStatus;
 

src/main/java/com/yunzhi/nanyang/entity/TdRawDevice.java

@@ -39,6 +39,12 @@ public class TdRawDevice implements Serializable,Cloneable{
     /** 具体信息;全部信息json格式 */
     @ApiModelProperty(name = "具体信息",notes = "全部信息json格式")
     private String deviceInfo ;
+
+     @ApiModelProperty(value = "定位")
+     private String location;
+
+     @ApiModelProperty(value = "位置信息")
+     private String address;
     /** 设备状态;0离线,1在线 */
     @ApiModelProperty(name = "设备状态",notes = "0离线,1在线")
     private Integer deviceStatus ;

src/main/resources/mapper/TdDeviceMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="getPageBy" resultType="com.yunzhi.nanyang.entity.TdDevice">
         SELECT
-            s.device_id,
+            t.device_id,
             t.device_no,
             t.device_kind AS device_type,
             s.machinery_id,
@@ -49,6 +49,7 @@
                 INNER JOIN ta_machinery s ON t.machinery_id = s.machinery_id
         WHERE
             t.location IS NOT NULL
+          AND t.status &gt; -1
           AND t.device_type IN
             <foreach collection="typeList" index="index" item="item" open="(" separator="," close=")">
                 #{item}