feats

pom.xml

@@ -181,16 +181,28 @@
 								<nonFilteredFileExtension>pem</nonFilteredFileExtension>
 								<nonFilteredFileExtension>pfx</nonFilteredFileExtension>
 								<nonFilteredFileExtension>p12</nonFilteredFileExtension>
+								<nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
+								<nonFilteredFileExtension>xls</nonFilteredFileExtension>
 							</nonFilteredFileExtensions>
 						</configuration>
 					</plugin>
 				</plugins>
 				<resources>
+<!--					<resource>-->
+<!--						<directory>src/main/resources</directory>-->
+<!--						<filtering>true</filtering>-->
+<!--						<excludes>-->
+<!--							<exclude>application.yml</exclude>-->
+<!--							<exclude>application-*.yml</exclude>-->
+<!--							<exclude>**/*.xlsx</exclude>-->
+<!--						</excludes>-->
+<!--					</resource>-->
 					<resource>
 						<directory>src/main/resources</directory>
 						<filtering>true</filtering>
 						<includes>
 							<include>**/*.xml</include>
+							<include>**/*.xlsx</include>
 							<include>**/*.p12</include>
 							<include>**/*.pem</include>
 							<include>application.yml</include>
@@ -238,24 +250,28 @@
 								<nonFilteredFileExtension>pem</nonFilteredFileExtension>
 								<nonFilteredFileExtension>pfx</nonFilteredFileExtension>
 								<nonFilteredFileExtension>p12</nonFilteredFileExtension>
+								<nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
+								<nonFilteredFileExtension>xls</nonFilteredFileExtension>
 							</nonFilteredFileExtensions>
 						</configuration>
 					</plugin>
 				</plugins>
 				<resources>
-					<resource>
-						<directory>src/main/resources</directory>
-						<filtering>true</filtering>
-						<excludes>
-							<exclude>application.yml</exclude>
-							<exclude>application-*.yml</exclude>
-						</excludes>
-					</resource>
+<!--					<resource>-->
+<!--						<directory>src/main/resources</directory>-->
+<!--						<filtering>true</filtering>-->
+<!--						<excludes>-->
+<!--							<exclude>application.yml</exclude>-->
+<!--							<exclude>application-*.yml</exclude>-->
+<!--							<exclude>**/*.xlsx</exclude>-->
+<!--						</excludes>-->
+<!--					</resource>-->
 					<resource>
 						<directory>src/main/resources</directory>
 						<filtering>true</filtering>
 						<includes>
 							<include>**/*.xml</include>
+							<include>**/*.xlsx</include>
 							<include>**/*.p12</include>
 							<include>**/*.pem</include>
 							<include>application.yml</include>

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

@@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 @Api(tags = "设备作业表对象功能接口")
 @RestController
-@RequestMapping("/")
+@RequestMapping("/admin")
 public class TaDeviceJobController extends BaseController {
 
     @Autowired
@@ -60,14 +60,12 @@ public class TaDeviceJobController extends BaseController {
     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 {
+                             @ApiParam("设备编号") @RequestParam(value = "deviceNo", required = false) String deviceNo,
+                             @ApiParam(value = "开始时间", example = "2022-10-01") @RequestParam(value = "startDate", required = false) String startDate,
+                             @ApiParam(value = "结束时间", example = "2022-10-31") @RequestParam(value = "endDate", required = false) String endDate) 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);
+        IPage<TaDeviceJob> result = taDeviceJobService.getPageBy(pg, deviceKind, deviceNo, startDate, endDate);
 
         return ResponseBean.success(result);
     }

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

@@ -86,6 +86,24 @@ public class TdRawDeviceController extends BaseController {
     @ApiOperation("新增设备")
     @PostMapping("/admin/raw-device")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody TdRawDevice tdRawDevice) throws Exception {
+
+        if (StringUtils.isEmpty(tdRawDevice.getDeviceKind())) {
+            return ResponseBean.error("设备大类不能为空");
+        }
+
+        if (StringUtils.isEmpty(tdRawDevice.getDeviceNo())) {
+            return ResponseBean.error("设备号不能为空");
+        }
+
+        QueryWrapper<TdRawDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("device_kind", tdRawDevice.getDeviceKind());
+        queryWrapper.eq("device_no", tdRawDevice.getDeviceNo());
+
+        TdRawDevice origin = tdRawDeviceService.getOne(queryWrapper);
+        if (null != origin) {
+            return ResponseBean.error("当前设备号已存在");
+        }
+
         tdRawDevice.setDeviceStatus(0); // 默认离线
         tdRawDevice.setCreateDate(LocalDateTime.now());
         tdRawDeviceService.save(tdRawDevice);

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

@@ -47,6 +47,10 @@ public class TaDeviceJob implements Serializable, Cloneable {
      */
     @ApiModelProperty(name = "农机ID", notes = "")
     private String machineryId;
+
+    @ApiModelProperty(name = "农机名称", notes = "")
+    @TableField(exist = false)
+    private String machineryName;
     /**
      * 作业面积
      */

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

@@ -34,4 +34,10 @@ public interface TaDeviceJobMapper  extends BaseMapper<TaDeviceJob>{
                                  @Param("deviceNo") String deviceNo,
                                  @Param("startDate") String startDate,
                                  @Param("endDate") String endDate);
- }
+
+    IPage<TaDeviceJob> getPageBy(IPage<TaDeviceJob> pg,
+                                 @Param("deviceKind") String deviceKind,
+                                 @Param("deviceNo") String deviceNo,
+                                 @Param("startDate") String startDate,
+                                 @Param("endDate") String endDate);
+}

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

@@ -1,7 +1,6 @@
 package com.yunzhi.nanyang.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.nanyang.entity.TaDeviceJob;
 
 import java.util.List;
@@ -18,4 +17,6 @@ public interface TaDeviceJobService extends IBaseService<TaDeviceJob> {
      Double statisTotalArea(String orgName, String deviceKind, String deviceNo, String startDate, String endDate);
 
      List<TaDeviceJob> listOrgBy(String orgName, String deviceKind, String deviceNo, String startDate, String endDate);
- }
+
+    IPage<TaDeviceJob> getPageBy(IPage<TaDeviceJob> pg, String deviceKind, String deviceNo, String startDate, String endDate);
+}

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

@@ -1,7 +1,6 @@
 package com.yunzhi.nanyang.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yunzhi.nanyang.entity.TaDeviceJob;
 import com.yunzhi.nanyang.mapper.TaDeviceJobMapper;
@@ -32,4 +31,9 @@ public class TaDeviceJobServiceImpl extends BaseServiceImpl<TaDeviceJobMapper, T
     public List<TaDeviceJob> listOrgBy(String orgName, String deviceKind, String deviceNo, String startDate, String endDate) {
         return baseMapper.listOrgBy(orgName, deviceKind, deviceNo, startDate, endDate);
     }
+
+    @Override
+    public IPage<TaDeviceJob> getPageBy(IPage<TaDeviceJob> pg, String deviceKind, String deviceNo, String startDate, String endDate) {
+        return baseMapper.getPageBy(pg, deviceKind, deviceNo, startDate, endDate);
+    }
 }

src/main/resources/mapper/TaDeviceJobMapper.xml

@@ -44,4 +44,25 @@
             t.*
         <include refid="statisOrg"></include>
     </select>
+    <select id="getPageBy" resultType="com.yunzhi.nanyang.entity.TaDeviceJob">
+        SELECT
+            s.`name` AS machinery_name,
+            t.*
+        FROM
+            ta_device_job t
+        LEFT JOIN ta_machinery s ON t.machinery_id = s.machinery_id
+        WHERE
+            1 = 1
+            <if test="deviceKind != null and deviceKind != ''">
+                AND t.device_kind = #{deviceKind}
+            </if>
+            <if test="deviceNo != null and deviceNo != ''">
+                AND t.device_no = #{deviceNo}
+            </if>
+            <if test="startDate != null and startDate != ''">
+                AND t.job_date BETWEEN #{startDate} AND #{endDate}
+            </if>
+        ORDER BY
+            t.job_date DESC
+    </select>
 </mapper>

src/test/java/com/yunzhi/demo/SpringApplicationTests.java

@@ -1,13 +0,0 @@
-package com.yunzhi.demo;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class SpringApplicationTests {
-
-	@Test
-	void contextLoads() {
-	}
-
-}