feats

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

@@ -87,6 +87,8 @@ public class TaDeviceJobController extends BaseController {
                                @ApiParam("合作社名称") @RequestParam(value = "orgName", required = false) String orgName,
                                @ApiParam("农机名称") @RequestParam(value = "machineryName", required = false) String machineryName,
                                @ApiParam("人员名称") @RequestParam(value = "userName", required = false) String userName,
+                               @ApiParam("农机ID") @RequestParam(value = "machineryId", required = false) String machineryId,
+                               @ApiParam("人员ID") @RequestParam(value = "userId", required = false) String userId,
                                @ApiParam("人员手机") @RequestParam(value = "phone", required = false) String phone,
                                @ApiParam("设备分类") @RequestParam(value = "deviceKind", required = false) String deviceKind,
                                @ApiParam("设备编号") @RequestParam(value = "deviceNo", required = false) String deviceNo,
@@ -94,8 +96,8 @@ public class TaDeviceJobController extends BaseController {
                                @ApiParam(value = "结束时间", example = "2022-10-31") @RequestParam(value = "endDate") String endDate) throws Exception {
 
         IPage<TaDeviceJob> pg = new Page<>(pageNum, pageSize);
-        IPage<TaDeviceJob> list = taDeviceJobService.statisOrgBy(pg, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone);
-        Double totalArea = taDeviceJobService.statisTotalArea(orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone);
+        IPage<TaDeviceJob> list = taDeviceJobService.statisOrgBy(pg, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
+        Double totalArea = taDeviceJobService.statisTotalArea(orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
 
         return ResponseBean.success(new HashMap<String, Object>(){{
             put("list", list);
@@ -119,6 +121,8 @@ public class TaDeviceJobController extends BaseController {
     public ResponseBean export(@ApiParam("合作社名称") @RequestParam(value = "orgName", required = false) String orgName,
                                @ApiParam("农机名称") @RequestParam(value = "machineryName", required = false) String machineryName,
                                @ApiParam("人员名称") @RequestParam(value = "userName", required = false) String userName,
+                               @ApiParam("农机ID") @RequestParam(value = "machineryId", required = false) String machineryId,
+                               @ApiParam("人员ID") @RequestParam(value = "userId", required = false) String userId,
                                @ApiParam("人员手机") @RequestParam(value = "phone", required = false) String phone,
                                @ApiParam("设备分类") @RequestParam(value = "deviceKind", required = false) String deviceKind,
                                @ApiParam("设备编号") @RequestParam(value = "deviceNo", required = false) String deviceNo,
@@ -126,7 +130,7 @@ public class TaDeviceJobController extends BaseController {
                                @ApiParam(value = "结束时间", example = "2022-10-31") @RequestParam(value = "endDate") String endDate,
                                HttpServletResponse response) throws Exception {
 
-        List<TaDeviceJob> list = taDeviceJobService.listOrgBy(orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone);
+        List<TaDeviceJob> list = taDeviceJobService.listOrgBy(orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
 
         Double total = 0.0;
         if (list != null || list.size() > 0) {

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

@@ -107,6 +107,24 @@ public class TdRawDeviceController extends BaseController {
             return ResponseBean.error("当前设备号已存在");
         }
 
+
+        String url = String.format("%s/%s/tdRawDevice/%s", deviceServer, tdRawDevice.getDeviceKind(), tdRawDevice.getDeviceNo());
+        String s = httpUtils.get(url);
+        if (StringUtils.isEmpty(s)) {
+            return ResponseBean.error("验证平台服务出错, 请联系技术人员");
+        } else {
+            JSONObject resp = JSONObject.parseObject(s);
+            if (!"1000".equals(resp.getString("code"))) {
+                String msg = resp.getString("message");
+                if (!StringUtils.isEmpty(msg)) {
+                    return ResponseBean.error(msg);
+                } else {
+                    return ResponseBean.error("验证平台服务出错, 未找到当前设备");
+                }
+            }
+        }
+
+
         tdRawDevice.setDeviceStatus(0); // 默认离线
         tdRawDevice.setCreateDate(LocalDateTime.now());
         tdRawDeviceService.save(tdRawDevice);

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

@@ -25,7 +25,9 @@ public interface TaDeviceJobMapper  extends BaseMapper<TaDeviceJob>{
                                     @Param("endDate") String endDate,
                                     @Param("machineryName") String machineryName,
                                     @Param("userName") String userName,
-                                    @Param("phone") String phone);
+                                    @Param("phone") String phone,
+                                    @Param("machineryId") String machineryId,
+                                    @Param("userId") String userId);
 
      Double statisTotalArea(@Param("orgName") String orgName,
                             @Param("deviceKind") String deviceKind,
@@ -34,7 +36,9 @@ public interface TaDeviceJobMapper  extends BaseMapper<TaDeviceJob>{
                             @Param("endDate") String endDate,
                             @Param("machineryName") String machineryName,
                             @Param("userName") String userName,
-                            @Param("phone") String phone);
+                            @Param("phone") String phone,
+                            @Param("machineryId") String machineryId,
+                            @Param("userId") String userId);
 
      List<TaDeviceJob> listOrgBy(@Param("orgName") String orgName,
                                  @Param("deviceKind") String deviceKind,
@@ -43,7 +47,9 @@ public interface TaDeviceJobMapper  extends BaseMapper<TaDeviceJob>{
                                  @Param("endDate") String endDate,
                                  @Param("machineryName") String machineryName,
                                  @Param("userName") String userName,
-                                 @Param("phone") String phone);
+                                 @Param("phone") String phone,
+                                 @Param("machineryId") String machineryId,
+                                 @Param("userId") String userId);
 
     IPage<TaDeviceJob> getPageBy(IPage<TaDeviceJob> pg,
                                  @Param("deviceKind") String deviceKind,

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

@@ -14,11 +14,11 @@ import java.util.List;
  */
 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, String machineryId, String userId);
 
-    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, String machineryId, String userId);
 
-    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, String machineryId, String userId);
 
     IPage<TaDeviceJob> getPageBy(IPage<TaDeviceJob> pg, String deviceKind, String deviceNo, String startDate, String endDate);
 

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

@@ -19,18 +19,18 @@ import java.util.List;
 public class TaDeviceJobServiceImpl extends BaseServiceImpl<TaDeviceJobMapper, TaDeviceJob> implements TaDeviceJobService {
 
     @Override
-    public IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone) {
-        return baseMapper.statisOrgBy(pg, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone);
+    public IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId) {
+        return baseMapper.statisOrgBy(pg, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
     }
 
     @Override
-    public Double statisTotalArea(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone) {
-        return baseMapper.statisTotalArea(orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone);
+    public Double statisTotalArea(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId) {
+        return baseMapper.statisTotalArea(orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
     }
 
     @Override
-    public List<TaDeviceJob> listOrgBy(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone) {
-        return baseMapper.listOrgBy(orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone);
+    public List<TaDeviceJob> listOrgBy(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId) {
+        return baseMapper.listOrgBy(orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
     }
 
     @Override

src/main/resources/mapper/TaDeviceJobMapper.xml

@@ -20,6 +20,12 @@
         <if test="orgName != null and orgName != ''">
             AND m.`name` LIKE CONCAT( '%', #{orgName}, '%' )
         </if>
+        <if test="machineryId != null and machineryId != ''">
+            AND s.machinery_id = #{machineryId}
+        </if>
+        <if test="userId != null and userId != ''">
+            AND t.user_id = #{userId}
+        </if>
         <if test="machineryName != null and machineryName != ''">
             AND s.`name` LIKE CONCAT( '%', #{machineryName}, '%' )
         </if>
@@ -87,7 +93,7 @@
         FROM
             ta_machinery t
         WHERE
-                t.machinery_id IN ( SELECT a.machinery_id FROM ta_device_job a WHERE a.user_id = #{userId} )
+              t.owner_id = #{userId}
           AND t.`status` &gt; - 1
         ORDER BY
             t.create_date DESC