feats

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

@@ -0,0 +1,109 @@
+package com.yunzhi.nanyang.controller;
+
+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.ResponseBean;
+
+import java.util.List;
+
+import com.yunzhi.nanyang.common.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.yunzhi.nanyang.entity.TaDeviceJob;
+import com.yunzhi.nanyang.service.TaDeviceJobService;
+
+/**
+ * 设备作业表;(ta_device_job)表控制层
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2022-11-3
+ */
+@Api(tags = "设备作业表对象功能接口")
+@RestController
+@RequestMapping("/")
+public class TaDeviceJobController extends BaseController {
+
+    @Autowired
+    private TaDeviceJobService taDeviceJobService;
+
+//    /**
+//     * 通过ID查询单条数据
+//     *
+//     * @param jobId 主键
+//     * @return 实例对象
+//     */
+//    @ApiOperation("通过ID查询单条数据")
+//    @GetMapping("/device-job/{id}")
+//    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+//        return ResponseBean.success(taDeviceJobService.getById(id));
+//    }
+
+    /**
+     * 分页查询
+     *
+     * @param pageNum  当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @ApiOperation("设备作业列表")
+    @GetMapping("/device-job")
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                             @ApiParam("设备分类") @RequestParam(value = "deviceKind", required = false) String deviceKind,
+                             @ApiParam("设备编号") @RequestParam(value = "deviceNo", required = false) String deviceNo) throws Exception {
+
+        IPage<TaDeviceJob> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaDeviceJob> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(!StringUtils.isEmpty(deviceKind), "device_kind", deviceKind);
+        queryWrapper.like(!StringUtils.isEmpty(deviceNo), "device_no", deviceNo);
+        queryWrapper.orderByDesc("job_date");
+        IPage<TaDeviceJob> result = taDeviceJobService.page(pg, queryWrapper);
+
+        return ResponseBean.success(result);
+    }
+
+//    /**
+//     * 新增数据
+//     *
+//     * @param taDeviceJob 实例对象
+//     * @return 实例对象
+//     */
+//    @ApiOperation("新增数据")
+//    @PostMapping("/device-job")
+//    public ResponseBean add(@ApiParam("对象实体") @RequestBody TaDeviceJob taDeviceJob) throws Exception {
+//        taDeviceJobService.save(taDeviceJob);
+//        return ResponseBean.success(taDeviceJob);
+//    }
+//
+//    /**
+//     * 更新数据
+//     *
+//     * @param taDeviceJob 实例对象
+//     * @return 实例对象
+//     */
+//    @ApiOperation("更新数据")
+//    @PutMapping("/device-job/{id}")
+//    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaDeviceJob taDeviceJob,
+//                             @ApiParam("对象ID") @PathVariable String id) throws Exception {
+//        taDeviceJobService.updateById(taDeviceJob);
+//        return ResponseBean.success(taDeviceJob);
+//    }
+//
+//    /**
+//     * 通过主键删除数据
+//     *
+//     * @param jobId 主键
+//     * @return 是否成功
+//     */
+//    @ApiOperation("通过主键删除数据")
+//    @DeleteMapping("/device-job/{id}")
+//    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) {
+//        taDeviceJobService.removeLogicById(id);
+//        return ResponseBean.success("success");
+//    }
+}

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

@@ -0,0 +1,48 @@
+package com.yunzhi.nanyang.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+ /**
+ * 设备作业表;
+ * @author : http://www.chiner.pro
+ * @date : 2022-11-3
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "设备作业表",description = "")
+@TableName("ta_device_job")
+public class TaDeviceJob implements Serializable,Cloneable{
+    /** 作业ID */
+    @ApiModelProperty(name = "作业ID",notes = "")
+    @TableId(value = "job_id", type = IdType.UUID)
+    private String jobId ;
+    /** 设备大类 */
+    @ApiModelProperty(name = "设备大类",notes = "")
+    private String deviceKind ;
+    /** 设备编号 */
+    @ApiModelProperty(name = "设备编号",notes = "")
+    private String deviceNo ;
+    /** 农机ID */
+    @ApiModelProperty(name = "农机ID",notes = "")
+    private String machineryId ;
+    /** 农机名称 */
+    @ApiModelProperty(name = "农机名称",notes = "")
+    private String machineryName ;
+    /** 作业面积 */
+    @ApiModelProperty(name = "作业面积",notes = "")
+    private Double jobArea ;
+    /** 作业时间 */
+    @ApiModelProperty(name = "作业时间",notes = "")
+    private String jobDate ;
+
+}

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

@@ -0,0 +1,16 @@
+package com.yunzhi.nanyang.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import com.yunzhi.nanyang.entity.TaDeviceJob;
+
+ /**
+ * 设备作业表;(ta_device_job)表数据库访问层
+ * @author : http://njyunzhi.com
+ * @date : 2022-11-3
+ */
+@Mapper
+public interface TaDeviceJobMapper  extends BaseMapper<TaDeviceJob>{
+    
+}

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

@@ -0,0 +1,13 @@
+package com.yunzhi.nanyang.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.nanyang.entity.TaDeviceJob;
+
+ /**
+ * 设备作业表;(ta_device_job)表服务接口
+ * @author : http://njyunzhi.com
+ * @date : 2022-11-3
+ */
+public interface TaDeviceJobService extends IBaseService<TaDeviceJob> {
+    
+}

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

@@ -0,0 +1,16 @@
+package com.yunzhi.nanyang.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yunzhi.nanyang.entity.TaDeviceJob;
+import com.yunzhi.nanyang.mapper.TaDeviceJobMapper;
+import com.yunzhi.nanyang.service.TaDeviceJobService;
+ /**
+ * 设备作业表;(ta_device_job)表服务实现类
+ * @author : http://www.chiner.pro
+ * @date : 2022-11-3
+ */
+@Service
+public class TaDeviceJobServiceImpl extends BaseServiceImpl<TaDeviceJobMapper, TaDeviceJob> implements TaDeviceJobService {
+    
+}

src/main/resources/mapper/TaDeviceJobMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.yunzhi.nanyang.mapper.TaDeviceJobMapper">
+    
+</mapper>

src/main/resources/mapper/TdDeviceMapper.xml

@@ -4,6 +4,7 @@
 
     <select id="getPageBy" resultType="com.yunzhi.nanyang.entity.TdDevice">
         SELECT
+            s.device_id,
             t.device_no,
             t.device_kind AS device_type,
             s.machinery_id,